From 3669fbb4a41ce0183adb5af832bfb2a5b2eb3f5a Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 12 May 2020 18:57:49 +0800 Subject: [PATCH 01/30] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=BA=93=E9=9B=AA=E5=B4=A9,=E6=9C=89=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E8=AF=B7=E6=8E=92=E6=9F=A5=E6=AD=A4=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 204 ++++++++++++++++----- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 47 ----- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 4 + .../i3plus/pojo/model/license/ImppLicense.java | 23 +++ .../i3plus/pojo/platform/bean/SysDataSource.java | 87 +++++++++ .../i3plus/pojo/platform/bean/SysDepartment.java | 8 + .../estsh/i3plus/pojo/platform/bean/SysMenu.java | 6 + .../i3plus/pojo/platform/bean/SysOrganize.java | 9 + .../i3plus/pojo/platform/bean/SysPojoVersion.java | 13 +- .../i3plus/pojo/platform/bean/SysPosition.java | 7 + .../estsh/i3plus/pojo/platform/bean/SysRole.java | 17 +- .../i3plus/pojo/platform/bean/SysUserInfo.java | 5 + .../repository/SysDataSourceRepository.java | 14 ++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 89 ++++++--- 14 files changed, 408 insertions(+), 125 deletions(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysDataSourceRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 01ad320..b1bdf8d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -19,58 +19,69 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SOFT_TYPE { - IMPP(1, 0, 0, "impp-platform", "IMPP平台"), - CORE(2, 8100, 4, "i3core", "i3业务平台"), - WMS(3, 8200, 10, "i3wms", "仓库管理软件"), - MES(4, 8300, 11, "i3mes", "生产管理软件"), - QMS(5, 0, 0, "i3qms", "质量管理软件"), - MES_PCN(6, 8350, 12, "i3mes-pcn", "生产管理软件-节点中心"), - SWEB(7, 8800, 19, "i3sweb", "供应商服务"), - - PTL(8, 8700, 20, "i3ptl", "亮灯自动拣选"), - PTL_PCN(9, 8750, 21, "i3ptl-pcn", "亮灯自动拣选-节点中心"), - - FORM(20, 8900, 16, "block-form", "智能表单"), - REPORT(21, 8910, 17, "block-report", "智能报表"), - WORKFLOW(22, 0, 0, "block-workflow", "智能工作流"), - JOBFLOW(23, 0, 0, "block-jobflow", "智能作业流"), - SOFTSWITCH(24, 8920, 18, "block-softswitch", "软件适配器"), - HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"), - LAC(26, 8600, 13, "lac", "连接适配器"), - ANDON(27, 8500, 14, "andon", "安灯"), - APS(28, 8400, 15, "i3aps", "高级计划与排产"), - CENTER(99, 8000, 1, "icloud-server", "注册中心"), - SURFACE(98, 0, 0, "i3surface", "对外服务"), - CLOUD(97, 0, 0, "i3cloud", "微服务"), - GATEWAY(96, 9000, 3, "impp-gateway", "服务网关"), - CONSOLE(95, 8010, 2, "impp-console", "服务监控台"), - DEV(9999, 0000, 0, "Development", "系统调试"); + /** WMS 服务 */ + WMS(3, 8200, 10, 102000000L, "i3wms", "仓库管理软件"), + SWEB(7, 8800, 19, 108000000L, "i3sweb", "供应商服务"), + QMS(5, 0, 0, 0, "i3qms", "质量管理软件"), - /** - * 产品ID - */ + /** Mes 服务 */ + MES(4, 8300, 11, 103000000L, "i3mes", "生产管理软件"), + MES_PCN(6, 8350, 12, 107000000L, "i3mes-pcn", "生产管理软件-节点中心"), + + /** PTL 服务 */ + PTL(8, 8700, 20, 111000000L, "i3ptl", "亮灯自动拣选"), + PTL_PCN(9, 8750, 21, 109000000L, "i3ptl-pcn", "亮灯自动拣选-节点中心"), + + /** Block 服务 */ + FORM(20, 8900, 16, 104000000L, "block-form", "智能表单"), + REPORT(21, 8910, 17, 105000000L, "block-report", "智能报表"), + WORKFLOW(22, 0, 0, 0, "block-workflow", "智能工作流"), + JOBFLOW(23, 0, 0, 0, "block-jobflow", "智能作业流"), + SOFTSWITCH(24, 8920, 18, 130000000L, "block-softswitch", "软件适配器"), + HARDSWITCH(25, 0, 0, 0, "block-hardswitch", "硬件适配器"), + + /** LAC 服务 */ + LAC(26, 8600, 13, 150000000L, "lac", "连接适配器"), + + /** 安灯服务 */ + ANDON(27, 8500, 14, 110000000L, "andon", "安灯"), + + /** 计划排产服务 */ + APS(28, 8400, 15, 140000000L, "i3aps", "高级计划与排产"), + SURFACE(98, 0, 0, 0, "i3surface", "对外服务"), + + /** 基础服务 */ + IMPP(1, 0, 0, 100000000L, "impp-platform", "IMPP平台"), + CONSOLE(95, 8010, 0, 0, "impp-console", "服务监控台"), + GATEWAY(96, 9000, 0, 0, "impp-gateway", "服务网关"), + CLOUD(97, 0, 0, 0, "i3cloud", "微服务"), + CENTER(99, 8000, 1, 0, "icloud-server", "注册中心"), + + /** 平台服务 */ + CORE(2, 8100, 4, 101000000L, "i3core", "i3业务平台"), + + /** 调试服务 */ + DEV(9999, 0000, 0, 120000000L, "Development", "系统调试"); + + + /** 产品ID */ private int value; - /** - * 应用默认端口 - */ - private int prot; - /** - * 应用默认雪花DataBaseId(0-31)共32 个存储区 - */ + /** 应用默认端口 */ + private int port; + /** 应用默认雪花DataBaseId(0-31)共32 个存储区 */ private int snowflakeId; - /** - * 产品代码 - */ + /** 产品代码 */ private String code; - /** - * 产品描述 - */ + /** 顶级菜单代码 */ + private long menuRootId; + /** 产品描述 */ private String description; - SOFT_TYPE(int value, int prot, int snowflakeId, String code, String description) { + SOFT_TYPE(int value, int port, int snowflakeId, long menuRootCode, String code, String description) { this.value = value; - this.prot = prot; + this.port = port; this.snowflakeId = snowflakeId; + this.menuRootId = menuRootCode; this.code = code; this.description = description; } @@ -87,14 +98,18 @@ public class CommonEnumUtil { return description; } - public int getProt() { - return prot; + public int getPort() { + return port; } public int getSnowflakeId() { return snowflakeId; } + public long getMenuRootId() { + return menuRootId; + } + public static String valueOfCode(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -135,7 +150,6 @@ public class CommonEnumUtil { } public static SOFT_TYPE valueOf(int val) { - String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { return values()[i]; @@ -144,6 +158,15 @@ public class CommonEnumUtil { return null; } + public static SOFT_TYPE valueOfMenuRootId(long id) { + for (int i = 0; i < values().length; i++) { + if (values()[i].menuRootId == id) { + return values()[i]; + } + } + return null; + } + public static SOFT_TYPE codeOfDescription(String code) { for (int i = 0; i < values().length; i++) { if (values()[i].code.equals(code)) { @@ -921,7 +944,9 @@ public class CommonEnumUtil { public enum LOG_LOGIN_PLATFORM { PC_IMPP_CORE(10, "PC-IMPP", "PC后台管理端"), PC_WMS_SWEB(20, "PC-SWEB", "PC SWEB后台管理端"), - Mobile_PDA(30, "Mobile-PDA", "移动设备PDA操作端"); + Mobile_PDA(30, "Mobile-PDA", "移动设备PDA操作端"), + MES_PCN(40, "MES-PCN", "MES-PCN"), + PTL_PCN(50, "PTL-PCN", "PTL-PCN"); private int value; private String name; @@ -2176,6 +2201,89 @@ public class CommonEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_SOURCE_STATUS { + CONN_SUCCESS(10, "验证成功", "验证成功"), + CONN_FAILURE(20, "验证失败", "验证失败"); +// TIME_OUT(30, "连接超时", "连接超时"), +// AUTH_ERROR(40, "账号密码错误", "账号密码错误"); + + private int value; + private String code; + private String description; + + private DATA_SOURCE_STATUS (int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + 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; + } + + public static DATA_SOURCE_STATUS valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + 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; + } + } + + /** * PC自定义搜索-字段类型 * 10-文本，20-数字，30-下拉框，40，时间，50-开窗 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 0323dbd..86c0877 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -6416,53 +6416,6 @@ public class WmsEnumUtil { } /** - * BatchHold 值类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum FG_INSTOCK_SN_TYPE { - NORMAL(10, "NORMAL", "实物条码(正常)"), - FIRST_PIECE(20, "FIRST_PIECE", "首件"), - MIDDLE_PIECE(30, "MIDDLE_PIECE", "中件"), - TAIL_PIECE(40, "TAIL_PIECE", "末件"); - - private int value; - private String code; - private String description; - - FG_INSTOCK_SN_TYPE(int value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public String getCode() { - return code; - } - - 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) { - return valueOf(val); - } - } - - /** * 返修、挑选状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 4d2fc73..fc99205 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -130,6 +130,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("密码") private String password; + @Column(name = "DEFAULT_RULE") + @ApiParam("默认赋值属性") + private String defaultRule; + @Transient @ApiParam("设备名称") private String equipmentName; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java index 77c3e53..d1cc3c6 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java @@ -70,6 +70,28 @@ public class ImppLicense implements Serializable { @ApiParam(value ="深思授权信息") private ImppLicenseSenseshield senseshield; + /* 备用预留字段 */ + @ApiParam(value ="备用字段") + private String licenseSpare01; + @ApiParam(value ="备用字段") + private String licenseSpare02; + @ApiParam(value ="备用字段") + private String licenseSpare03; + @ApiParam(value ="备用字段") + private String licenseSpare04; + @ApiParam(value ="备用字段") + private String licenseSpare05; + @ApiParam(value ="备用字段") + private String licenseSpare06; + @ApiParam(value ="备用字段") + private String licenseSpare07; + @ApiParam(value ="备用字段") + private String licenseSpare08; + @ApiParam(value ="备用字段") + private String licenseSpare09; + @ApiParam(value ="备用字段") + private String licenseSpare10; + /* 业务人员信息 */ @ApiParam(value ="授权创建时间") private Date licenseCreateDateTime; // 授权时间 @@ -92,6 +114,7 @@ public class ImppLicense implements Serializable { @ApiParam(value ="锁类型") private String lockType; + /* 基础业务逻辑 */ @ApiParam(value ="到期时间") private String maturityDateTime; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java new file mode 100644 index 0000000..a32264f --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java @@ -0,0 +1,87 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +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 : alwaysfrin + * @CreateDate : 2019-02-27 10:53 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_DATA_SOURCE") +@Api(value="数据对象") +public class SysDataSource extends BaseBean { + + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品类型") + private Integer softType; + + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + + @Column(name="SOURCE_NAME") + @ApiParam(value ="数据源名称") + private String sourceName; + + @Column(name="SOURCE_CODE") + @ApiParam(value ="数据源编码") + private String sourceCode; + + @Column(name="SOURCE_STATUS") + @ApiParam(value ="数据源状态",name = "状态：可用，不可用 看枚举当中是否存在") + private Integer sourceStatus; + public String getSourceStatusTxt() { + return softType == null ? null : CommonEnumUtil.DATA_SOURCE_STATUS.valueOfDescription(sourceStatus); + } + + @Column(name="SOURCE_TYPE") + @ApiParam(value ="数据源类型",name = "BlockFormEnumUtil.DATA_SOURCE_TYPE") + private Integer sourceType; + public String getSourceTypeTxt() { + return softType == null ? null : CommonEnumUtil.DATA_SOURCE_TYPE.valueOfDescription(sourceType); + } + + + @Column(name="SOURCE_HOST") + @ApiParam(value ="数据源连接地址") + private String sourceHost; + + @Column(name="SOURCE_PORT") + @ApiParam(value ="数据源端口") + private Integer sourcePort; + + @Column(name="SOURCE_DATA_BASE_NAME") + @ApiParam(value ="数据库名称") + private String sourceDataBaseName; + + @Column(name="SOURCE_USER_NAME") + @ApiParam(value ="数据库用户名称") + private String sourceUserName; + + @Column(name="SOURCE_PASSWORD") + @ApiParam(value ="数据库用户密码") + private String sourcePassword; + + @Column(name="SOURCE_DESCRIPTION") + @ApiParam(value ="数据源描述") + private String sourceDescription; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java index 79daa0f..4121b94 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java @@ -68,4 +68,12 @@ public class SysDepartment extends BaseBean { @ApiParam(value ="子集列表") private List childList; + public SysDepartment() { + } + + public SysDepartment(String departmentCode, Long parentId, Long organizeId) { + this.departmentCode = departmentCode; + this.parentId = parentId; + this.organizeId = organizeId; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 8a47f38..59afede 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -113,4 +113,10 @@ public class SysMenu extends BaseBean { @ApiParam(value ="子集列表") private List childList = new ArrayList<>(); + public SysMenu() { + } + + public SysMenu(String menuCode) { + this.menuCode = menuCode; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java index 2bb58d7..e8162c5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java @@ -80,4 +80,13 @@ public class SysOrganize extends BaseBean { @ApiParam(value ="子集ID列表") private List childIdList; + public SysOrganize() { + } + + public SysOrganize(String organizeCode, Integer organizeType, Long parentId, Integer organizeStatus) { + this.organizeCode = organizeCode; + this.organizeType = organizeType; + this.parentId = parentId; + this.organizeStatus = organizeStatus; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java index 3fe7559..4348f54 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java @@ -26,7 +26,10 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_POJO_VERSION") +@Table(name="SYS_POJO_VERSION",indexes = { + @Index(name="index_sys_pojo_version_ref_id",columnList = "REF_ID"), + @Index(name="index_sys_pojo_version_ref_class",columnList = "REF_CLASS"), +}) @Api(value="对象历史") public class SysPojoVersion extends BaseBean { @@ -41,6 +44,11 @@ public class SysPojoVersion extends BaseBean { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } + @Column(name="PLAN_ID") + @ApiParam(value ="对象计划id" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long planId; + @Column(name="REF_ID") @ApiParam(value ="对象id" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -79,4 +87,7 @@ public class SysPojoVersion extends BaseBean { @ApiParam(value ="用户部门信息") private SysPojoVersionDetail versionDetail; + @Transient + @ApiParam(value ="操作对象本身") + private String bean; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java index 1479652..9040b15 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java @@ -59,4 +59,11 @@ public class SysPosition extends BaseBean { @ApiParam(value ="子部门列表") private List childList; + public SysPosition() { + } + + public SysPosition(String positionCode, Long parentId) { + this.positionCode = positionCode; + this.parentId = parentId; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java index 9786250..788a76c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java @@ -11,10 +11,8 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.Type; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; +import javax.persistence.*; +import java.util.List; /** * @Description : 用户登陆表 @@ -53,4 +51,15 @@ public class SysRole extends BaseBean { @ApiParam(value ="角色状态（枚举：1.正常，2.状态）" , example ="-1") private Integer roleStatus; + @Transient + @ApiParam(value ="角色拥有功能权限信息") + private transient List menuIdList; + + public SysRole() { + } + + public SysRole(String name, Integer roleStatus) { + this.name = name; + this.roleStatus = roleStatus; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index 0a3735b..fded310 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -247,4 +247,9 @@ public class SysUserInfo extends BaseBean { @ApiParam(value = "岗位信息") @AnnoOutputColumn(hidden = true) private SysPosition position; + + @Transient + @ApiParam(value = "图像信息") + @AnnoOutputColumn(hidden = true) + private String imageFileUrl; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysDataSourceRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysDataSourceRepository.java new file mode 100644 index 0000000..15c469b --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysDataSourceRepository.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.SysDataSource; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-11 上午11:05 + * @Modify: + **/ +public interface SysDataSourceRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 8e68d4d..d71a80e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -128,7 +128,7 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(position.getOrganizeCode()); // 查询参数封装 -// DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result); + DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result); // String Like DdlPreparedPack.getStringLikerPack(position.getName(),"name",result); DdlPreparedPack.getStringLikerPack(position.getPositionCode(),"positionCode",result); @@ -154,6 +154,21 @@ public class CoreHqlPack { /** + * 岗位复杂查询 + * @param bean + * @return + */ + public static DdlPackBean packHqlSysRefUserPosition(SysRefUserPosition bean){ + DdlPackBean result = DdlPackBean.getDdlPackBean(bean); + + // 查询参数封装 + DdlPreparedPack.getNumEqualPack(bean.getUserId(),"userId",result); + + return result; + } + + + /** * 组织复杂查询 * @param organize * @return @@ -176,13 +191,22 @@ public class CoreHqlPack { } public static DdlPackBean packHqlSysOrganize(SysOrganize organize,List idList){ + HqlPack.getOrderDefault(organize); + DdlPackBean result = DdlPackBean.getDdlPackBean(organize); - // String Like DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result); DdlPreparedPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getNumEqualPack(organize.getParentId(),"parentId",result); + + // 查询参数封装 + if(organize.getChildIdList() != null){ + DdlPreparedPack.getInPack(StringUtils.join(organize.getChildIdList(),","),"parentId",result); + } + // Number In DdlPreparedPack.getInPackList(idList,"id",result); + return result; } @@ -201,6 +225,7 @@ public class CoreHqlPack { * @param department * @return */ + @Deprecated public static String packHqlSysDepartment(SysDepartment department){ StringBuffer result = new StringBuffer(); @@ -223,34 +248,15 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(department); DdlPreparedPack.getStringLikerPack(department.getName(),"name",result); - DdlPreparedPack.getStringLikerPack(department.getName(),"departmentCode",result); + DdlPreparedPack.getNumEqualPack(department.getParentId(),"parentId",result); + DdlPreparedPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result); + DdlPreparedPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result); DdlPreparedPack.getInPackList(idList,"id",result); result.setOrderByStr(department.orderBy()); return result; } - /** - * 系统权限复杂查询 - * @param menu - * @return - */ - public static String packHqlSysMenu(SysMenu menu){ - StringBuffer result = new StringBuffer(); - - // 查询参数封装 - HqlPack.getNumEqualPack(menu.getParentId(),"parentId",result); - HqlPack.getNumEqualPack(menu.getMenuType(),"menuType",result); - HqlPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); - HqlPack.getStringLikerPack(menu.getName(),"name",result); - HqlPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result); - - // 添加默认排序 - HqlPack.getOrderDefault(menu); - - return result.toString(); - } - public static DdlPackBean packDdlBeanSysMenu(SysMenu menu,List idList){ DdlPackBean result = DdlPackBean.getDdlPackBean(menu); @@ -1008,7 +1014,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysDictionary(SysDictionary sysDictionary){ - DdlPackBean packBean = new DdlPackBean(); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(sysDictionary); DdlPreparedPack.getStringEqualPack(sysDictionary.getName(), "name", packBean); DdlPreparedPack.getStringEqualPack(sysDictionary.getDictionaryCode(), "dictionaryCode", packBean); @@ -1020,4 +1026,37 @@ public class CoreHqlPack { return packBean; } + + /** + * 按条件查询字典 + * @param bean + * @return + */ + public static DdlPackBean packHqlSysPojoVersion(SysPojoVersion bean){ + DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean); + + DdlPreparedPack.getNumEqualPack(bean.getRefId(),"refId",packBean); + DdlPreparedPack.getNumEqualPack(bean.getPlanId(),"planId",packBean); + DdlPreparedPack.getNumEqualPack(bean.getOperateType(),"operateType",packBean); + DdlPreparedPack.getStringLeftLikerPack(bean.getRefClass(),"refClass",packBean); + DdlPreparedPack.getStringLeftLikerPack(bean.getVersionMethodName(),"versionMethodName",packBean); + DdlPreparedPack.getStringLikerPack(bean.getPojoCompare(),"pojoCompare",packBean); + + return packBean; + } + + + public static DdlPackBean packSysDataSource(SysDataSource bean){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean); + + DdlPreparedPack.getStringLikerPack(bean.getSourceHost(), "sourceHost", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getSourceName(), "sourceName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getSourceCode(), "sourceCode", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getSourceDataBaseName(), "sourceDataBaseName", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getSourceType(), "sourceType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getSourceStatus(), "sourceStatus", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getSoftType(), "softType", ddlPackBean); + + return ddlPackBean; + } } \ No newline at end of file From c288b5466062ece5aab1f8f994254bdbba9a63f2 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 14 May 2020 13:46:46 +0800 Subject: [PATCH 02/30] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/bean/SysDataSource.java | 1 + .../i3plus/pojo/platform/bean/SysPojoVersion.java | 4 +--- .../pojo/platform/bean/SysPojoVersionDetail.java | 3 +-- .../pojo/platform/bean/SysPojoVersionPlan.java | 2 +- .../pojo/platform/platbean/SysLogConsole.java | 5 ++++- .../pojo/platform/platbean/SysLogException.java | 13 ++++-------- .../pojo/platform/platbean/SysLogOperate.java | 23 +++++++++------------- .../pojo/platform/platbean/SysLogSystem.java | 10 ++++++++-- .../pojo/platform/platbean/SysLogTaskTime.java | 9 ++++++--- .../i3plus/pojo/report/sqlpack/ReportHqlPack.java | 8 ++++---- 10 files changed, 39 insertions(+), 39 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java index a32264f..fce7b6f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value="数据对象") public class SysDataSource extends BaseBean { + private static final long serialVersionUID = -3116421427693381484L; @Column(name="SOFT_TYPE") @ApiParam(value ="产品类型") private Integer softType; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java index 4348f54..8c7a6cb 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java @@ -33,9 +33,7 @@ import javax.persistence.*; @Api(value="对象历史") public class SysPojoVersion extends BaseBean { - - private static final long serialVersionUID = -2456588444446248239L; - + private static final long serialVersionUID = -2265406135818649545L; @Column(name="SOFT_TYPE") @ApiParam(value ="产品类型") private Integer softType; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java index 19f9d82..9831c18 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java @@ -32,8 +32,7 @@ import javax.persistence.Table; @Api(value="对象历史") public class SysPojoVersionDetail extends BaseBean { - - private static final long serialVersionUID = -2456588444446248239L; + private static final long serialVersionUID = 5385530381442176242L; @Column(name="POJO_VERSION_ID") @ApiParam(value ="对象id" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java index 407d667..8be2265 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java @@ -29,7 +29,7 @@ import javax.persistence.Table; @Api(value="对象历史") public class SysPojoVersionPlan extends BaseBean { - private static final long serialVersionUID = -1120504360281638917L; + private static final long serialVersionUID = -3125272220108497862L; @Column(name="SOFT_TYPE") @ApiParam(value ="产品类型") private Integer softType; 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 fd31e35..f9c7f28 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 @@ -35,7 +35,10 @@ public class SysLogConsole extends BaseBean { /******** 服务器信息 ********/ @Column(name="SOFT_TYPE") @ApiParam(value ="产品名称") - private String softType; + private Integer softType; + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } @Column(name="LOG_HOST") @ApiParam(value ="服务器IP") 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 e4b46a1..d64db0e 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 @@ -33,17 +33,12 @@ public class SysLogException extends BaseBean { //CommonEnumUtil.SOFT_TYPE @Indexed - @Column(name="EXC_MODULE_ID") + @Column(name="SOFT_TYPE") @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") - private Integer excModule; - - private String excModuleName; - public String getExcModuleName(){ - if(this.excModule != null){ - return CommonEnumUtil.SOFT_TYPE.valueOfDescription(this.excModule); - } - return excModuleName; + private Integer softType; + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } @Column(name="EXC_CLASS_NAME") 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 c9d392c..704d025 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 @@ -35,17 +35,12 @@ import javax.persistence.Table; public class SysLogOperate extends BaseBean { @Indexed - @Column(name="OPERATE_MODULE") + @Column(name="SOFT_TYPE") @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") - private Integer operateModule; - - private String operateModuleName; - public String getOperateModuleName(){ - if(this.operateModule != null){ - return CommonEnumUtil.SOFT_TYPE.valueOfDescription(this.operateModule); - } - return operateModuleName; + private Integer softType; + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } @Indexed @@ -54,8 +49,8 @@ public class SysLogOperate extends BaseBean { @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description") private Integer operateType; - public String getOperateTypeName(){ - return ImppEnumUtil.OPERATE_TYPE.valueOfCode(operateType); + public String getOperateTypeTxt(){ + return operateType == null ? null : ImppEnumUtil.OPERATE_TYPE.valueOfDescription(operateType); } @Column(name="OPERATE_MESSAGE") @@ -74,9 +69,9 @@ public class SysLogOperate extends BaseBean { @ApiParam(value ="请求路径" , access ="请求路径") private String requestUrl; - @Column(name="HTTP_METHOD") - @ApiParam(value ="http请求方法" , access ="http请求方法") - private String httpMethod; +// @Column(name="HTTP_METHOD") +// @ApiParam(value ="http请求方法" , access ="http请求方法") +// private String httpMethod; @Column(name="LOG_ARGS") @ApiParam(value ="方法入参" , access ="方法入参") 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 5d81ed5..5de995d 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 @@ -39,12 +39,18 @@ public class SysLogSystem extends BaseBean { @ApiParam(value ="日志级别" , example ="1") @AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class,refForeignKey = "value",value = "name") private Integer logLevel; + public String getLogLevelTxt() { + return logLevel == null ? null : ImppEnumUtil.LOG_LEVEL.valueOfDescription(logLevel); + } @Indexed - @Column(name="LOG_MODULE_ID") + @Column(name="SOFT_TYPE") @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") - private Integer logModuleId; + private Integer softType; + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } @Column(name="REMOTE_IP") @ApiParam(value ="请求IP" , access ="请求IP") 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 fedc271..591d9a9 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 @@ -63,9 +63,12 @@ public class SysLogTaskTime extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long taskPlanId; - @Column(name = "TASK_SOFT_TYPE_RDD") - @ApiParam(value = "任务所属模块") - private Integer taskSoftTypeRdd; + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品名称") + private Integer softType; + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } @Column(name="TASK_CYCLE_NAME_RDD") @ApiParam(value ="任务周期名称") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java index 2beeaa9..c465cee 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java @@ -114,13 +114,13 @@ public class ReportHqlPack { * @param brLayout * @return */ - public static String packHqlBrLayout(BrLayout brLayout){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBrLayout(BrLayout brLayout){ + DdlPackBean result = DdlPackBean.getDdlPackBean(brLayout); // 查询参数封装 - HqlPack.getStringLikerPack(brLayout.getLayoutName(),"layoutName",result); + DdlPreparedPack.getStringLikerPack(brLayout.getLayoutName(),"layoutName",result); - return result.toString(); + return result; } /** From 0352980cde50eeb0cb5980bd142d214853993837 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 15 May 2020 09:28:33 +0800 Subject: [PATCH 03/30] =?UTF-8?q?bug:=20[8516]=20=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E8=AE=A1=E7=AE=97bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java index 83c18ad..0fedc5b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java @@ -123,4 +123,8 @@ public class MesOee extends BaseBean implements Serializable { @Transient @ApiParam("自定义数据map") private List operateObjectAttributes; + + @Transient + @ApiParam("手工录入集合") + private List attributes; } From b741b6950b904b73bbf69176ac36c4df561b70f7 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 15 May 2020 14:42:48 +0800 Subject: [PATCH 04/30] =?UTF-8?q?bug:=20[8516]=20=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E8=AE=A1=E7=AE=97bug=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java index e05a54e..9a340e4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOperateObjectAttribute.java @@ -50,8 +50,4 @@ public class MesOperateObjectAttribute extends BaseBean implements Serializable @Transient @ApiParam("属性值") private String attributeValue; - - @Transient - @ApiParam("是否自定义属性") - private boolean customAttribute = false; } From 1ea5b54052c5ba06352908038054b63423fb51cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 15 May 2020 15:07:09 +0800 Subject: [PATCH 05/30] =?UTF-8?q?=E3=80=90=E7=94=9F=E6=88=90=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E5=8D=95=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E8=AE=A9?= =?UTF-8?q?=E6=AD=A5=E5=AD=97=E6=AE=B5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index c6a3d0a..3f0402c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -84,6 +84,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("间隔时间") private Integer checkInterval = 0; + @Column(name = "IS_CONCESSION") + @ApiParam("是否允许让步") + private Integer isConcession = 0; + @Transient @ApiParam("检测类型名称") private String checkTypeName; From 55a87bb6da651663abc8e2f020d5e277fb2b17a5 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 15 May 2020 17:23:13 +0800 Subject: [PATCH 06/30] =?UTF-8?q?1841=20RFID=E5=B7=A5=E8=A3=85=E7=A7=BB?= =?UTF-8?q?=E5=BA=93=E5=A4=8D=E7=94=A8=E6=AC=A7=E6=B4=B2=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=A7=BB=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 43fe989..bb25c21 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -6,10 +6,10 @@ public class WmsInterfaceEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DIRECTION_TYPE { - SAP2WMS(10, "SAP2WMS", "SAP --> WMS"), - WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), - MES2WMS(30, "MES2WMS", "MES --> WMS"), - WMS2MES(40, "WMS2MES", "WMS --> MES"); + SAP2WMS(10, "SAP2WMS-2", "SAP --> WMS"), + WMS2SAP(20, "WMS2SAP-2", "WMS --> SAP"), + MES2WMS(30, "MES2WMS-2", "MES --> WMS"), + WMS2MES(40, "WMS2MES-2", "WMS --> MES"); private int value; private String name; From 40e5297303b30901df26aa94e85916c4fac9531d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 15 May 2020 17:25:48 +0800 Subject: [PATCH 07/30] =?UTF-8?q?8442=20=E4=B8=AD=E8=88=AA-BH=E8=A7=A3?= =?UTF-8?q?=E7=BB=91-=E4=BA=8B=E5=8A=A1=E5=85=B3=E8=81=94=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index bb25c21..43fe989 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -6,10 +6,10 @@ public class WmsInterfaceEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DIRECTION_TYPE { - SAP2WMS(10, "SAP2WMS-2", "SAP --> WMS"), - WMS2SAP(20, "WMS2SAP-2", "WMS --> SAP"), - MES2WMS(30, "MES2WMS-2", "MES --> WMS"), - WMS2MES(40, "WMS2MES-2", "WMS --> MES"); + SAP2WMS(10, "SAP2WMS", "SAP --> WMS"), + WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), + MES2WMS(30, "MES2WMS", "MES --> WMS"), + WMS2MES(40, "WMS2MES", "WMS --> MES"); private int value; private String name; From 7eb72ee5d1c5eab1c7c477a74ce3136f00314916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sat, 16 May 2020 14:24:57 +0800 Subject: [PATCH 08/30] =?UTF-8?q?=E3=80=90=E8=B0=83=E8=AF=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=9B=9E=E4=BC=A0=E5=92=8C=E5=90=8C=E6=AD=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java index 924fc78..8e58dec 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java @@ -94,4 +94,8 @@ public class IfQcOrder extends BaseBean implements Serializable { @ApiParam("发运时间") private String deliveryDate; + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java index 186a0ac..7972aa2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java @@ -29,7 +29,7 @@ import java.io.Serializable; @Api("IF_质检结果") public class IfQcResult extends BaseBean implements Serializable { - private static final long serialVersionUID = -5412635747424111476L; + //private static final long serialVersionUID = -5412635747424111476L; @Column(name = "ORDER_NO") @ApiParam("质检单号") private String orderNo; From 8ab6e7762059da557c7aca4575d1c7b274ef9245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 18 May 2020 15:01:20 +0800 Subject: [PATCH 09/30] =?UTF-8?q?=E3=80=908528=20=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E6=A3=80=E9=AA=8C-=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=9C=AA=E5=BC=80=E5=8F=91=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesQcOrderAccessory.java | 44 ++++++++++++++++++++++ .../repository/MesQcOrderAccessoryRepository.java | 14 +++++++ 2 files changed, 58 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderAccessoryRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java new file mode 100644 index 0000000..df69cde --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java @@ -0,0 +1,44 @@ +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: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_ORDER_ACCESSORY") +@Api("MES_检验单附件") +public class MesQcOrderAccessory extends BaseBean implements Serializable { + + //private static final long serialVersionUID = -5412635747424111476L; + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "ACCESSORY_NAME") + @ApiParam("附件名称") + private String accessoryName; + + @Column(name = "ACCESSORY_URL") + @ApiParam("附件路径") + private String accessoryUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderAccessoryRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderAccessoryRepository.java new file mode 100644 index 0000000..d9c9157 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderAccessoryRepository.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.MesQcOrderAccessory; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesQcOrderAccessoryRepository extends BaseRepository { +} From 6c7a88b962294521261b9ef009af8e69da5e876a Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 18 May 2020 20:10:37 +0800 Subject: [PATCH 10/30] =?UTF-8?q?bug:=E3=80=908520=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/{engine/script => bean}/EngineScriptPersistence.java | 2 +- .../{engine/script => bean}/EngineScriptPersistenceHistory.java | 2 +- .../wms/repository/EngineScriptPersistenceHistoryRepository.java | 2 +- .../pojo/wms/repository/IEngineScriptPersistenceRepository.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 +++++--- 5 files changed, 9 insertions(+), 7 deletions(-) rename modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/{engine/script => bean}/EngineScriptPersistence.java (97%) rename modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/{engine/script => bean}/EngineScriptPersistenceHistory.java (97%) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java similarity index 97% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java index c7e9d7c..345b775 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.engine.script; +package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistenceHistory.java similarity index 97% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistenceHistory.java index 4615324..18c15f2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistenceHistory.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.engine.script; +package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.java index 52818f2..449fe2d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/EngineScriptPersistenceHistoryRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistenceHistory; +import cn.estsh.i3plus.pojo.wms.bean.EngineScriptPersistenceHistory; import org.springframework.stereotype.Repository; @Repository diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java index de8bf6d..0870082 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; +import cn.estsh.i3plus.pojo.wms.bean.EngineScriptPersistence; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; 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 c81035f..61a567d 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 @@ -15,13 +15,15 @@ import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplate; import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; -import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; -import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistenceHistory; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; /** From e2ce63a9cd70507c50aa43021451c83c2daa8d15 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 19 May 2020 11:33:50 +0800 Subject: [PATCH 11/30] =?UTF-8?q?bug:=20[8533]=20plc=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BA=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 88 ++++++++++++++++------ 1 file changed, 63 insertions(+), 25 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 eba9bab..d524f9f 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 @@ -14,14 +14,14 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HQL_EXPRESSION { - GT(">",">","大于"), - LT("<","<","小于"), - EQ("=","=","等于"), - NEQ("!=","!=","不等于"), - GTE(">=",">=","大于等于"), - LTE("<=","<=","小于等于"), - LIKE("like","like","LIKE"), - IN("in","in","包含"); + GT(">", ">", "大于"), + LT("<", "<", "小于"), + EQ("=", "=", "等于"), + NEQ("!=", "!=", "不等于"), + GTE(">=", ">=", "大于等于"), + LTE("<=", "<=", "小于等于"), + LIKE("like", "like", "LIKE"), + IN("in", "in", "包含"); private String value; private String code; @@ -240,7 +240,7 @@ public class MesEnumUtil { } /** - * 排序校验模式 + * 排序校验模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CHECK_PROD_SEQ_FLAG { @@ -307,7 +307,7 @@ public class MesEnumUtil { } /** - * 排序校验模式 + * 排序校验模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TOOLING_ACTION_RECORD_TYPE { @@ -371,6 +371,7 @@ public class MesEnumUtil { return valueOf(val); } } + /** * JIS发运是否按主队列顺序扫描 */ @@ -3241,7 +3242,7 @@ public class MesEnumUtil { BH_ORDER(40, "B&H工单"), JIT_ORDER(50, "JIT工单"), STOCK_ORDER(60, "库存工单"), - REPAIR(70,"返修插单"); + REPAIR(70, "返修插单"); private int value; private String description; @@ -5009,7 +5010,7 @@ public class MesEnumUtil { } /** - * 作业校验模式 + * 作业校验模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CHECK_MODEL { @@ -5044,7 +5045,7 @@ public class MesEnumUtil { } /** - * PLC类型 + * PLC类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PLC_TYPE { @@ -5079,7 +5080,7 @@ public class MesEnumUtil { } /** - * 看板类型 + * 看板类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum BOARD_TYPE { @@ -5124,7 +5125,7 @@ public class MesEnumUtil { } /** - * 看板类型 + * 看板类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum BOARD_OBJECT_TYPE { @@ -5207,7 +5208,7 @@ public class MesEnumUtil { } /** - * 界面类型 + * 界面类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WINDOW_TYPE { @@ -5243,7 +5244,7 @@ public class MesEnumUtil { /** - * 运算对象属性 运算类型 + * 运算对象属性 运算类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OPERATE_TYPE { @@ -5279,7 +5280,7 @@ public class MesEnumUtil { } /** - * 运算对象属性 属性类型 + * 运算对象属性 属性类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ATTRIBUTE_TYPE { @@ -5314,7 +5315,7 @@ public class MesEnumUtil { } /** - * 运算对象属性配置 赋值类型 + * 运算对象属性配置 赋值类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum VALUE_TYPE { @@ -5360,7 +5361,7 @@ public class MesEnumUtil { } /** - * 运算对象 对象代码 + * 运算对象 对象代码 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OBJECT_CODE { @@ -5406,7 +5407,7 @@ public class MesEnumUtil { } /** - * 脚本类型（组件、表单、报表、JOB、其他） + * 脚本类型（组件、表单、报表、JOB、其他） */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SCRIPT_TYPE { @@ -5444,7 +5445,7 @@ public class MesEnumUtil { } /** - * 语言类型（Groovy、Python、JavaScript、Scala、Ruby） + * 语言类型（Groovy、Python、JavaScript、Scala、Ruby） */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SCRIPT_LANGUAGE { @@ -5482,9 +5483,8 @@ public class MesEnumUtil { } - /** - * 运算对象代码 + * 运算对象代码 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OPERATE_OBJECT_CODE { @@ -5530,7 +5530,7 @@ public class MesEnumUtil { } /** - * oee 运算状态 + * oee 运算状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OEE_STATUS { @@ -5730,4 +5730,42 @@ public class MesEnumUtil { } } + + /** + * MES_PLC 数据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_DATA_TYPE { + + INT("int", "数字"), + STRING("string", "字符串"), + BOOLEAN("boolean", "布尔"); + + private String value; + private String description; + + PLC_DATA_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } From f8ccd0166e86b5543c7554fcbe2e8a1715119295 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 19 May 2020 15:25:25 +0800 Subject: [PATCH 12/30] =?UTF-8?q?BUG=E3=80=908554=E3=80=91=20=E4=B8=AD?= =?UTF-8?q?=E8=88=AA-=E5=B7=A5=E8=A3=85=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=90=8E=EF=BC=8C=E4=B8=80=E4=B8=AAexcel?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E4=BA=A7=E7=94=9F=E4=B8=80=E7=AC=94=E4=BA=8B?= =?UTF-8?q?=E7=89=A9=EF=BC=8C=E6=98=8E=E7=BB=86=E6=8C=89=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 30 ++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index e85e34c..bb0066f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; -import cn.estsh.i3plus.pojo.base.util.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,7 +10,12 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Lob; +import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库存移动单主表信息 @@ -235,6 +239,28 @@ public class WmsMoveMaster extends BaseBean { this.orderStatus = orderStatus; } + + public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, + Integer isUrgent, String carNo, Integer busiTypeCode, String refOrderNo, String remark, + String organizeCode, String createDatetime, String createUser, String modifyDatetime, String modifyUser, String fixId + ) { + this.orderNo = orderNo; + this.orderStatus = orderStatus; + this.remark = remark; + this.isUrgent = isUrgent; + this.transTypeCode = transTypeCode; + this.errorMessage = errorMessage; + this.busiTypeCode = busiTypeCode; + this.refOrderNo = refOrderNo; + this.carNo = carNo; + this.organizeCode = organizeCode; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + this.fixId = fixId; + } + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); } From 6a28329d757c0bab04376fa20bacccec35b60d8f Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 19 May 2020 15:28:06 +0800 Subject: [PATCH 13/30] =?UTF-8?q?=E3=80=908441=20=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=9B=9E=E6=89=A7=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 392c8e6..03deeea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -143,7 +143,7 @@ public class WmsASNMasterDetails extends BaseBean { public WmsASNMasterDetails(){} - public WmsASNMasterDetails(Double recQty,String partNo,String orderNo,String partNameRdd,String item,String unit,String erpAreaNo,String organizeCode){ + public WmsASNMasterDetails(Double recQty,String partNo,String orderNo,String partNameRdd,String item,String unit,String erpAreaNo,String organizeCode,String planDate,String planTime){ this.recQty = recQty; this.partNo = partNo; this.orderNo = orderNo; @@ -152,5 +152,7 @@ public class WmsASNMasterDetails extends BaseBean { this.unit = unit; this.erpAreaNo = erpAreaNo; this.organizeCode = organizeCode; + this.planDate = planDate; + this.planTime = planTime; } } From e3accbf24e2214f32599cac45d706993c13dd36a Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 19 May 2020 16:01:28 +0800 Subject: [PATCH 14/30] =?UTF-8?q?=E3=80=908441=20=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=9B=9E=E6=89=A7=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 03deeea..9ff19b8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -143,8 +143,9 @@ public class WmsASNMasterDetails extends BaseBean { public WmsASNMasterDetails(){} - public WmsASNMasterDetails(Double recQty,String partNo,String orderNo,String partNameRdd,String item,String unit,String erpAreaNo,String organizeCode,String planDate,String planTime){ + public WmsASNMasterDetails(Double recQty,Double qty,String partNo,String orderNo,String partNameRdd,String item,String unit,String erpAreaNo,String organizeCode,String planDate,String planTime){ this.recQty = recQty; + this.qty = qty; this.partNo = partNo; this.orderNo = orderNo; this.partNameRdd = partNameRdd; From 8e94cbb8fa475965a7d2c84f6c5d11446fa69dad Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 20 May 2020 10:54:22 +0800 Subject: [PATCH 15/30] =?UTF-8?q?pojo=20=E5=BA=8F=E5=88=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java index df69cde..5a8deb4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java @@ -29,7 +29,8 @@ import java.io.Serializable; @Api("MES_检验单附件") public class MesQcOrderAccessory extends BaseBean implements Serializable { - //private static final long serialVersionUID = -5412635747424111476L; + private static final long serialVersionUID = 2648132773643541110L; + @Column(name = "ORDER_NO") @ApiParam("质检单号") private String orderNo; From 281a2dccb5d1e924b024e9a815806fcb3465e130 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 20 May 2020 11:42:05 +0800 Subject: [PATCH 16/30] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=87=87=E8=B4=AD=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/WmsAutoPurchasePartModel.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java index ac17a25..f6df34c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java @@ -4,6 +4,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; + /** * @Description : 零件自动采购单信息 * @Reference : @@ -23,13 +25,22 @@ public class WmsAutoPurchasePartModel { @ApiParam("物料名称") private String partName; + @ApiParam(value = "单位") + private String unit; + @ApiParam("物料数量") - private Integer qty; + private Double qty; @ApiParam("Erp库存地") private String erpWarehouse; - public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse) { + @ApiParam("供应商编码") + private String vendorNo; + + @ApiParam("供应商名称") + private String vendorName; + + public WmsAutoPurchasePartModel(String partNo, String partName, Double qty, String warehouse) { this.partNo = partNo; this.partName = partName; this.qty = qty; From f161270af87d1dea13fa83a725ce69669c6002db Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 20 May 2020 14:49:03 +0800 Subject: [PATCH 17/30] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java index d1cc3c6..32281e5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java @@ -7,7 +7,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; import java.io.Serializable; -import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.Objects; @@ -41,7 +40,7 @@ public class ImppLicense implements Serializable { /* 基础信息 */ @ApiParam(value ="授权ID") - private Long Id; // ID + private Long id; // ID @ApiParam(value ="授权应用ID") private Long appId; // APP_ID @ApiParam(value ="授权读取授权数据ID") From 56ae714283f44c353f62dd516c58964a0206cf64 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 20 May 2020 17:38:04 +0800 Subject: [PATCH 18/30] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1845?= =?UTF-8?q?=EF=BC=8C=E5=AE=89=E7=81=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonActionModule.java | 4 - .../estsh/i3plus/pojo/andon/bean/AndonActor.java | 2 +- .../i3plus/pojo/andon/bean/AndonActorRule.java | 2 +- .../pojo/andon/bean/AndonRouteModuleParam.java | 2 +- .../i3plus/pojo/andon/bean/AndonRouteStatus.java | 10 +- .../andon/bean/AndonRouteStatusErrorRecord.java | 67 ++++++++++ .../pojo/andon/model/AndonRouteStatusModel.java | 12 +- .../i3plus/pojo/andon/model/CommonMsgModel.java | 4 +- .../IAndonActionModuleParamRepository.java | 16 +++ .../repository/IAndonActionModuleRepository.java | 16 +++ .../IAndonAlarmRouteModuleParamRepository.java | 16 +++ .../repository/IAndonAlarmTypeRepository.java | 16 +++ .../repository/IAndonMessageTypeRepository.java | 16 +++ .../IAndonRouteStatusErrorRecordRepository.java | 16 +++ .../repository/IAndonRouteStatusRepository.java | 16 +++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 142 +++++++++++++++++--- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 147 ++++++++++++++++----- 17 files changed, 443 insertions(+), 61 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleParamRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteModuleParamRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmTypeRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMessageTypeRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusErrorRecordRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java index d9c9896..979bd4b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java @@ -50,10 +50,6 @@ public class AndonActionModule extends BaseBean implements Serializable { @ApiParam("组件类型") private Integer amType; - @Column(name = "INTERFACE_NO") - @ApiParam("界面编号") - private String interfaceNo; - @Transient @ApiParam("执行顺序") private Integer seq; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java index 315564b..9e23c15 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java @@ -40,7 +40,7 @@ public class AndonActor extends BaseBean implements Serializable { private String actorName; @Column(name = "ACTOR_Class") - @ApiParam("actor名称") + @ApiParam("actor类名") private String actorClass; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java index 4220d64..81e2f4b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @Table(name = "ANDON_ACTOR_RULE") @EqualsAndHashCode(callSuper = true) -@Api("ACTOR消息获取规则") +@Api("ACTOR消息类型配置") public class AndonActorRule extends BaseBean implements Serializable { private static final long serialVersionUID = 3244584643305867326L; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java index 49f2640..fd7db4f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java @@ -24,7 +24,7 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "PTL_ROUTE_MODULE_PARAM") +@Table(name = "ANDON_ROUTE_MODULE_PARAM") @EqualsAndHashCode(callSuper = true) @Api("流程组件参数") public class AndonRouteModuleParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java index 2e57b5d..1724576 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java @@ -76,6 +76,14 @@ public class AndonRouteStatus extends BaseBean implements Serializable { @ApiParam("状态类型") private Integer statusType; + @Column(name = "INTERFACE_NO") + @ApiParam("界面编号") + private String interfaceNo; + + @Transient + @ApiParam("安灯流程ID") + private Long alarmRouteId; + @Transient @ApiParam("默认不缓存") private boolean cacheFlag = false; @@ -85,7 +93,7 @@ public class AndonRouteStatus extends BaseBean implements Serializable { private boolean actionAmgIdFalg = false; @Transient - @ApiParam("触发组件集默认未执行") + @ApiParam("触发类型默认不需要外部触发") private boolean checkTriggerTypeFalg = false; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java new file mode 100644 index 0000000..b6cbca9 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java @@ -0,0 +1,67 @@ +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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_ROUTE_STATUS_ERROR_RECORD") +@EqualsAndHashCode(callSuper = true) +@Api("流程状态异常记录") +public class AndonRouteStatusErrorRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4046192879130584866L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "ANDON_ORDER_NO") + @ApiParam(value = "安灯队列编号") + public String andonOrderNo; + + @Column(name = "ERROR_DESC") + @ApiParam(value = "失败描述") + public String errorDesc; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心") + public String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作中心") + public String workCellCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + public String alarmCode; + + @Column(name = "SOURCE_TYPE") + @ApiParam(value = "安灯来源类型") + private String sourceType; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java index b7dd7fb..a1849c2 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRouteStatusModel.java @@ -60,12 +60,18 @@ public class AndonRouteStatusModel implements Serializable { @ApiParam("流程类型") private Integer routeType; + @ApiParam("界面编号") + private String interfaceNo; + + @ApiParam("安灯流程ID") + private Long alarmRouteId; + public AndonRouteStatusModel() { } public AndonRouteStatusModel(String routeCode, String statusCode, String statusName, String nextStatus, Integer triggerType, - String triggerEvent, String triggerWhere, Long actionAmgId, Long inAmgId, Long outAmgId, - Integer statusType, String alarmCode, String workCenterCode, Integer routeType) { + String triggerEvent, String triggerWhere, Long actionAmgId, Long inAmgId, Long outAmgId, Integer statusType, + String interfaceNo, String alarmCode, String workCenterCode, Integer routeType, Long alarmRouteId) { this.routeCode = routeCode; this.statusCode = statusCode; this.statusName = statusName; @@ -77,8 +83,10 @@ public class AndonRouteStatusModel implements Serializable { this.inAmgId = inAmgId; this.outAmgId = outAmgId; this.statusType = statusType; + this.interfaceNo = interfaceNo; this.alarmCode = alarmCode; this.workCenterCode = workCenterCode; this.routeType = routeType; + this.alarmRouteId = alarmRouteId; } } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java index 449b959..109a2cc 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java @@ -39,8 +39,10 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("当前流程状态") private AndonRouteStatus curRouteStatus; - @ApiModelProperty("外部触发事件") + @ApiModelProperty("触发事件") private String triggerEvent; + @ApiModelProperty("下个触发事件，一个组件集执行完毕后这个值赋给triggerEvent") + private String nextTriggerEvent; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleParamRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleParamRepository.java new file mode 100644 index 0000000..386ff91 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleParam; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-13 11:07 + * @Modify: + **/ +@Repository +public interface IAndonActionModuleParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleRepository.java new file mode 100644 index 0000000..7b30626 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonActionModuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-13 11:07 + * @Modify: + **/ +@Repository +public interface IAndonActionModuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteModuleParamRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteModuleParamRepository.java new file mode 100644 index 0000000..6d1f805 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmRouteModuleParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRouteModuleParam; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-13 11:07 + * @Modify: + **/ +@Repository +public interface IAndonAlarmRouteModuleParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmTypeRepository.java new file mode 100644 index 0000000..89ffba6 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAlarmTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-30 11:05 + * @Modify: + **/ +@Repository +public interface IAndonAlarmTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMessageTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMessageTypeRepository.java new file mode 100644 index 0000000..c591caa --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMessageTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonMessageType; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-11-12-14:24 + * @Modify: + **/ +@Repository +public interface IAndonMessageTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusErrorRecordRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusErrorRecordRepository.java new file mode 100644 index 0000000..f65809a --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusErrorRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonRouteStatusErrorRecord; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface IAndonRouteStatusErrorRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusRepository.java new file mode 100644 index 0000000..00fdc18 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRouteStatusRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonRouteStatus; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface IAndonRouteStatusRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 74e3e2b..3cc844f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -3,14 +3,9 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; import cn.estsh.i3plus.pojo.andon.bean.*; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; -import cn.estsh.i3plus.pojo.base.bean.ListPager; -import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; +import org.springframework.util.StringUtils; /** * @Description : 安灯对象查询封装 @@ -62,7 +57,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpLevel(), "rpLevel", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpObjectCode(), "rpObjectCode", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getStatusCode(), "statusCode", packBean); - if(StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeEnd())){ + if(!StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeEnd())){ DdlPreparedPack.timeBuilder(andonMessageRecord.getCreateDateTimeStart(), andonMessageRecord.getCreateDateTimeEnd(), "createDatetime", packBean, true); } return packBean; @@ -209,7 +204,7 @@ public class AndonHqlPack { public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) { // 判断工厂代码是否为空 - if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + if (!StringUtils.isEmpty(bean.getOrganizeCode())) { DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } @@ -373,7 +368,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEcCode(), "ecCode", packBean); DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEmCode(), "emCode", packBean); - if(StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeEnd())){ + if(!StringUtils.isEmpty(andonKnowledgeBase.getCreateDateTimeStart()) || !StringUtils.isEmpty(andonKnowledgeBase.getCreateDateTimeEnd())){ DdlPreparedPack.timeBuilder(andonKnowledgeBase.getCreateDateTimeStart(), andonKnowledgeBase.getCreateDateTimeEnd(), "createDatetime", packBean, true); } @@ -418,7 +413,7 @@ public class AndonHqlPack { DdlPreparedPack.getInPackList(andonManageQueue.getTypeList(), "alarmCode", result); // 只有安灯任务管理特殊用途 DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result); - if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){ + if(!StringUtils.isEmpty(andonManageQueue.getCallTimeStart()) || !StringUtils.isEmpty(andonManageQueue.getCallTimeEnd())){ DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true); } getStringBuilderPack(andonManageQueue, result); @@ -557,10 +552,10 @@ public class AndonHqlPack { */ public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode); - if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())){ + if (!StringUtils.isEmpty(mesEquipment.getWorkCellCode())){ DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean); } - if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){ + if (!StringUtils.isEmpty(mesEquipment.getEquipmentCode())){ DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean); } packBean.setOrderByStr(mesEquipment.orderBy()); @@ -575,13 +570,13 @@ public class AndonHqlPack { */ public static DdlPackBean getMesShift(MesShift shift, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode); - if (StringUtils.isNotEmpty(shift.getShiftCode())){ + if (!StringUtils.isEmpty(shift.getShiftCode())){ DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean); } - if (StringUtils.isNotEmpty(shift.getShiftName())){ + if (!StringUtils.isEmpty(shift.getShiftName())){ DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean); } - if (StringUtils.isNotEmpty(shift.getWorkCenterCode())){ + if (!StringUtils.isEmpty(shift.getWorkCenterCode())){ DdlPreparedPack.getStringEqualPack(shift.getWorkCenterCode(), "workCenterCode", packBean); } @@ -876,4 +871,121 @@ public class AndonHqlPack { DdlPreparedPack.timeBuilder(startDateTime, endDateTime, "createDatetime", result, true); return result; } + + /** + * actor信息 + * @param actor + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonActor(AndonActor actor, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(actor, organizeCode); + if (!StringUtils.isEmpty(actor.getActorCode())) { + DdlPreparedPack.getStringLikerPack(actor.getActorCode(), "actorCode", packBean); + } + if (!StringUtils.isEmpty(actor.getActorName())) { + DdlPreparedPack.getStringLikerPack(actor.getActorName(), "actorName", packBean); + } + if (!StringUtils.isEmpty(actor.getActorClass())) { + DdlPreparedPack.getStringLikerPack(actor.getActorClass(), "actorClass", packBean); + } + return packBean; + } + + /** + * 消息类型 + * @param messageType + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonMessageType(AndonMessageType messageType, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(messageType, organizeCode); + if (!StringUtils.isEmpty(messageType.getMtCode())) { + DdlPreparedPack.getStringLikerPack(messageType.getMtCode(), "mtCode", packBean); + } + if (!StringUtils.isEmpty(messageType.getMtName())) { + DdlPreparedPack.getStringLikerPack(messageType.getMtName(), "mtName", packBean); + } + return packBean; + } + + /** + * actor消息类型配置 + * @param actorRule + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonActorRule(AndonActorRule actorRule, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(actorRule, organizeCode); + if (!StringUtils.isEmpty(actorRule.getActorCode())) { + DdlPreparedPack.getStringLikerPack(actorRule.getActorCode(), "actorCode", packBean); + } + if (!StringUtils.isEmpty(actorRule.getMtCode())) { + DdlPreparedPack.getStringLikerPack(actorRule.getMtCode(), "mtCode", packBean); + } + return packBean; + } + + /** + * 安灯类型 + * @param alarmType + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonAlarmType(AndonAlarmType alarmType, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(alarmType, organizeCode); + if (!StringUtils.isEmpty(alarmType.getAlarmCode())) { + DdlPreparedPack.getStringLikerPack(alarmType.getAlarmCode(), "alarmCode", packBean); + } + if (!StringUtils.isEmpty(alarmType.getAlarmName())) { + DdlPreparedPack.getStringLikerPack(alarmType.getAlarmName(), "alarmName", packBean); + } + return packBean; + } + + /** + * 组件 + * @param actionModule + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonActionModule(AndonActionModule actionModule, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(actionModule, organizeCode); + if (!StringUtils.isEmpty(actionModule.getAmCode())) { + DdlPreparedPack.getStringLikerPack(actionModule.getAmCode(), "amCode", packBean); + } + if (!StringUtils.isEmpty(actionModule.getAmName())) { + DdlPreparedPack.getStringLikerPack(actionModule.getAmName(), "amName", packBean); + } + if (!StringUtils.isEmpty(actionModule.getCallClass())) { + DdlPreparedPack.getStringLikerPack(actionModule.getCallClass(), "callClass", packBean); + } + if (!StringUtils.isEmpty(actionModule.getAmType())) { + DdlPreparedPack.getNumEqualPack(actionModule.getAmType(), "amType", packBean); + } + return packBean; + } + + /** + * 组件参数 + * @param actionModuleParam + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonActionModuleParam(AndonActionModuleParam actionModuleParam, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(actionModuleParam, organizeCode); + if (!StringUtils.isEmpty(actionModuleParam.getAmCode())) { + DdlPreparedPack.getStringLikerPack(actionModuleParam.getAmCode(), "amCode", packBean); + } + if (!StringUtils.isEmpty(actionModuleParam.getParamCode())) { + DdlPreparedPack.getStringLikerPack(actionModuleParam.getParamCode(), "paramCode", packBean); + } + if (!StringUtils.isEmpty(actionModuleParam.getParamName())) { + DdlPreparedPack.getStringLikerPack(actionModuleParam.getParamName(), "paramName", packBean); + } + if (!StringUtils.isEmpty(actionModuleParam.getParamType())) { + DdlPreparedPack.getNumEqualPack(actionModuleParam.getParamType(), "paramType", packBean); + } + return packBean; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index f685c3c..2350d9d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -13,22 +13,29 @@ import org.apache.commons.lang3.StringUtils; public class AndonEnumUtil { /** - * 流程状态-触发类型 + * 状态点界面编号 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ROUTE_TRIGGER_TYPE { - INNER_TRIGGER(10, "内部触发"), - OUTER_TRIGGER(20, "外部触发"); + public enum ANDON_ROUTE_STATUS_INTERFACE_NO { + EQUMENT_ALARM_CALL("EQUMENT_ALARM_CALL", "设备呼叫弹框界面"), + QUALITY_ALARM_CALL("QUALITY_ALARM_CALL", "质量呼叫弹框界面"), + PART_ALARM_CALL("PART_ALARM_CALL", "物料呼叫弹框界面"), + ROUTING_ALARM_CALL("ROUTING_ALARM_CALL", "工艺呼叫弹框界面"), + OTHER_ALARM_CALL("OTHER_ALARM_CALL", "自处理呼叫弹框界面"), + FIX_ERROR_CALL("FIX_ERROR_CALL", "自动报警呼叫弹框界面"), + ALARM_SIGN("ALARM_SIGN", "响应弹框界面"), + ALARM_CANCEL("ALARM_CANCEL", "撤销二次提醒框"), + ALARM_RESOLVE("ALARM_RESOLVE", "解决弹框界面"); - private int value; + private String value; private String description; - ROUTE_TRIGGER_TYPE(int value, String description) { + ANDON_ROUTE_STATUS_INTERFACE_NO(String value, String description) { this.value = value; this.description = description; } - public int getValue() { + public String getValue() { return value; } @@ -38,20 +45,21 @@ public class AndonEnumUtil { } /** - * 组件状态类型 + * 组件参数类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ROUTE_STATUS_TYPE { - START(10, "START", "开始状态"), - EXECUTING(20, "EXECUTING", "执行中状态"), - TERMINATE(30, "TERMINATE", "中断状态"), - FINISH(40, "FINISH", "完成状态"); + public enum ACTION_MODULE_PARAM_TYPE { + + QUALIFIED(10, "number", "数字"), + DEFECTED(20, "text", "字符串"), + SCRAPED(30, "select", "可选值"), + BUTTON(40, "button", "按钮"); private int value; private String code; private String description; - ROUTE_STATUS_TYPE(int value, String code, String description) { + ACTION_MODULE_PARAM_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -68,16 +76,24 @@ public class AndonEnumUtil { public String getDescription() { return 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; + } } /** - * 安灯作业组件-组件类型 + * 组件类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ACTION_MODULE_AM_TYPE { - - METHOD_MODULE(10, "方法组件"), - INTERFACE_MODULE(20, "界面组件"); + COMMON_MODULE(10, "通用组件"); private int value; private String description; @@ -94,15 +110,63 @@ public class AndonEnumUtil { public String getDescription() { return 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; + /** + * 流程状态-触发类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_TRIGGER_TYPE { + INNER_TRIGGER(10, "内部触发"), + OUTER_TRIGGER(20, "外部触发"); + + private int value; + private String description; + + ROUTE_TRIGGER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 组件状态类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_STATUS_TYPE { + START(10, "START", "开始状态"), + EXECUTING(20, "EXECUTING", "执行中状态"), + TERMINATE(30, "TERMINATE", "中断状态"), + FINISH(40, "FINISH", "完成状态"); + + private int value; + private String code; + private String description; + + ROUTE_STATUS_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; } } @@ -831,21 +895,23 @@ public class AndonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ANDON_ACTION_TAG { - CALL(1,"10","呼叫"), - SIGN(2,"20","响应"), - RESOLVE(3,"30","解决"), - CANCEL(4,"40", "撤销"), - COMMIT(5,"50","解决待审"), - PASS(6,"60","审批完成"), - REJECT(7,"70","驳回"), - CONFIRMED_CANCEL(8,"80","撤销已确认"); + CALL(1, "1","10","呼叫"), + SIGN(2, "2","20","响应"), + RESOLVE(3, "3","30","解决"), + CANCEL(4, "4","40", "撤销"), + COMMIT(5, "5","50","解决待审"), + PASS(6, "6","60","审批完成"), + REJECT(7, "7","70","驳回"), + CONFIRMED_CANCEL(8, "8","80","撤销已确认"); private int value; + private String valueStr; private String code; private String description; - ANDON_ACTION_TAG(int value, String code, String description) { + ANDON_ACTION_TAG(int value, String valueStr, String code, String description) { this.value = value; + this.valueStr = valueStr; this.code = code; this.description = description; } @@ -854,6 +920,8 @@ public class AndonEnumUtil { return value; } + public String getValueStr(){ return valueStr; } + public String getCode(){ return code; } public String getDescription() { @@ -869,6 +937,15 @@ public class AndonEnumUtil { return null; } + public static ANDON_ACTION_TAG getByValueStr(String valueStr) { + for (ANDON_ACTION_TAG actionTag : values()) { + if (actionTag.getValueStr().equals(valueStr)) { + return actionTag; + } + } + return null; + } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { From 654f1dcc84cc4f5bb61014b852ebb468e3174ad0 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 20 May 2020 17:43:48 +0800 Subject: [PATCH 19/30] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1845?= =?UTF-8?q?=EF=BC=8C=E5=AE=89=E7=81=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 89d1c41..2eddf76 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ modules/i3plus-pojo-lac modules/i3plus-pojo-ptl modules/i3plus-pojo-ics -` modules/i3plus-pojo-mdm + modules/i3plus-pojo-mdm From 5ef88c80c0883390271c4f4a275d81659395e552 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 20 May 2020 18:09:14 +0800 Subject: [PATCH 20/30] =?UTF-8?q?=E6=8F=90=E6=B5=8B=E5=90=88=E5=B9=B6=20?= =?UTF-8?q?=E8=BF=98=E5=8E=9Fpom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..11691be 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..8ef99a3 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 807bef5..577686d 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b948580..f714b7d 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index e12eaee..b7991cc 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index c338f71..0648e9f 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..f10cf39 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 7637865..3b9e57a 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d98b7d8..b1911ec 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index bf96e57..56d54cb 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index a758a6a..830caa5 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index efacfd2..fb51da0 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index dba12cc..78bbdef 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 81670b2..fb44d00 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26a7311..dc4ea86 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index eaf2544..8571a5f 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0f615b6..e36258d 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 9e5f745..9915420 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 0fea52b..61027b2 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc8fce6..c2104bf 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 99d3c9d7213dccd5c5543e6a87b13f076c496931 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 20 May 2020 18:15:22 +0800 Subject: [PATCH 21/30] =?UTF-8?q?=E6=8F=90=E6=B5=8B=E5=90=88=E5=B9=B6=20?= =?UTF-8?q?=E8=BF=98=E5=8E=9Fpom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 807bef5..9f9717e 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b948580..a9e288f 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index e12eaee..a44418c 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index c338f71..2de88b5 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 7637865..50ab2c2 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d98b7d8..7f94617 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index bf96e57..d800ecf 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index a758a6a..60fc467 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index efacfd2..d65e031 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index dba12cc..a785f21 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 81670b2..d6d2f8e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26a7311..0fbfb69 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index eaf2544..76739f9 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0f615b6..0368700 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 9e5f745..b2eedd4 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 0fea52b..5fcd08a 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc8fce6..2eddf76 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 608aa6be9085a9c81669a3cad7e435fffedbe1f9 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 20 May 2020 18:21:56 +0800 Subject: [PATCH 22/30] =?UTF-8?q?=E8=BF=98=E5=8E=9Fpom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f9717e..807bef5 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index a9e288f..b948580 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index a44418c..e12eaee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 2de88b5..c338f71 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 50ab2c2..7637865 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 7f94617..d98b7d8 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index d800ecf..bf96e57 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 60fc467..a758a6a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index d65e031..efacfd2 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index a785f21..dba12cc 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index d6d2f8e..81670b2 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 0fbfb69..26a7311 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 76739f9..eaf2544 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0368700..0f615b6 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index b2eedd4..9e5f745 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 5fcd08a..0fea52b 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 2eddf76..cc8fce6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From e42641855d7042a40dc473ad47235c7ea9dc7d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 21 May 2020 09:23:02 +0800 Subject: [PATCH 23/30] =?UTF-8?q?=E3=80=908528=20=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E6=A3=80=E9=AA=8C-=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java index df69cde..2bf20b3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderAccessory.java @@ -41,4 +41,8 @@ public class MesQcOrderAccessory extends BaseBean implements Serializable { @Column(name = "ACCESSORY_URL") @ApiParam("附件路径") private String accessoryUrl; + + @Column(name = "FASTDFS_URL") + @ApiParam("fastDfs地址") + private String fastdfsUrl; } From f50b76cd1f9cd550099bd1eef72fc7024d046549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 21 May 2020 09:26:56 +0800 Subject: [PATCH 24/30] =?UTF-8?q?Task1858:=E7=94=B5=E6=9E=AA=E6=9E=AA?= =?UTF-8?q?=E5=A4=B4=E6=9B=B4=E6=8D=A2=E8=AE=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 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 81d92e8..920a748 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 @@ -313,7 +313,8 @@ public class MesEnumUtil { public enum TOOLING_ACTION_RECORD_TYPE { REPLACE(10, "REPLACE", "更换"), WAREHOUSE(20, "WAREHOUSE", "入库"), - Use(30, "Use", "领用"); + Use(30, "Use", "领用"), + ERROR(40, "ERROR", "异常操作"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java index 23cb9bf..167372a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java @@ -63,15 +63,15 @@ public class MesEquipmentTooling extends BaseBean implements Serializable { @ApiParam("更换结束时间") private String endTime; + @Column(name = "USE_COUNT_MAX") + @ApiParam("最大使用次数") + private Integer useCountMax; + @Column(name = "REMIND_COUNT") @ApiParam("提醒次数") private Integer remindCount; @Transient - @ApiParam("最大次数") - private Integer useCountMax; - - @Transient @ApiParam("按钮名称") private String btnName; From e578cb882a47e7e97111bc0b956e7e7abf9c746a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 21 May 2020 09:27:40 +0800 Subject: [PATCH 25/30] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BB=A3=E7=A0=81=E6=A8=A1=E7=B3=8A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d7ad228..bcef8c7 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 @@ -3144,7 +3144,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlBasImportTemplate(BasImportTemplate template) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(template.getTemplateName(), "templateName", result); - DdlPreparedPack.getStringEqualPack(template.getTemplateCode(), "templateCode", result); + DdlPreparedPack.getStringLikerPack(template.getTemplateCode(), "templateCode", result); DdlPreparedPack.getStringEqualPack(template.getGroupName(), "groupName", result); getStringBuilderPack(template, result); return result; From a8efa9008925d035b3bc90c7fc8936bbe6341a32 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Thu, 21 May 2020 14:52:49 +0800 Subject: [PATCH 26/30] =?UTF-8?q?bug=207461,count=E6=97=B6=E5=8E=BB?= =?UTF-8?q?=E6=8E=89distinct=E3=80=82Fix=20Bug=20#7461?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index b60d2e0..f1d9061 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -569,7 +569,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int listCount() { try{ - Long count = entityManager.createQuery("select count(distinct model) from " + persistentClass.getName() + " as model",Long.class) + Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model",Long.class) .getSingleResult(); return count == null ? 0 : count.intValue(); }catch(NoResultException e){ @@ -580,7 +580,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int findByPropertyCount(String propertyName, Object value) { try{ - String queryString = "select count(distinct model) from " + persistentClass.getName() + " as model where model." + propertyName + "= :" + propertyName; + String queryString = "select count(model) from " + persistentClass.getName() + " as model where model." + propertyName + "= :" + propertyName; Long count = entityManager.createQuery(queryString, Long.class) .setParameter(propertyName, value) .getSingleResult(); @@ -612,7 +612,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } StringBuffer queryString = new StringBuffer(); - queryString.append("select count(distinct model) from " + persistentClass.getName() + " as model"); + queryString.append("select count(model) from " + persistentClass.getName() + " as model"); int size = propertyNames.length; if (size > 0) { @@ -755,7 +755,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } StringBuffer queryString = new StringBuffer(); - queryString.append("select count(distinct model) from " + persistentClass.getSimpleName() + " as model where 1=1 "); + queryString.append("select count(model) from " + persistentClass.getSimpleName() + " as model where 1=1 "); if (hqlWhere != null && hqlWhere.length() > 0) { queryString.append(hqlWhere); @@ -859,7 +859,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int findByHqlWhereCount(String hqlWhere) { StringBuffer queryString = new StringBuffer(); - queryString.append("select count(distinct model) from " + persistentClass.getSimpleName() + " as model where 1=1 "); + queryString.append("select count(model) from " + persistentClass.getSimpleName() + " as model where 1=1 "); if (hqlWhere != null && hqlWhere.length() > 0) { queryString.append(hqlWhere); @@ -875,7 +875,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public int findByHqlWhereCount(DdlPackBean packBean) { StringBuffer queryString = new StringBuffer(); - queryString.append("select count(distinct model) from " + persistentClass.getSimpleName() + queryString.append("select count(model) from " + persistentClass.getSimpleName() + " as model where 1=1 " + packBean.getWhereAppend()); Query query = entityManager.createQuery(queryString.toString(), Long.class); From 491bc32325405be4a3f082f342d4ae5b6ce08997 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 21 May 2020 15:05:08 +0800 Subject: [PATCH 27/30] Fix Bug#8345 --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 72 ++++++++++++++++++++++ .../wms/dbinterface/WmsInterfaceDataMapper.java | 14 +++++ 2 files changed, 86 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 0be07d0..bb07db9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -6966,4 +6966,76 @@ public class WmsEnumUtil { return tmp; } } + + + /** + * 软适配数据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SOFT_DATA_FORM { + XML(10, "XML", "XML"), JSON(20, "JSON", "JSON"); + private int value; + private String code; + private String description; + + SOFT_DATA_FORM(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static SOFT_DATA_FORM codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 48203e8..2541e40 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -1,10 +1,14 @@ package cn.estsh.i3plus.pojo.wms.dbinterface; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -159,4 +163,14 @@ public class WmsInterfaceDataMapper extends BaseBean { */ @Column(name = "USE_SCRIPT_FILTER") public Integer useScriptFilter; + + + /** + * 数据格式类型 + */ + @Column(name = "SOFT_DATA_TYPE") + @ApiParam(value = "数据格式类型") + @ColumnDefault("10") + @AnnoOutputColumn(refClass = WmsEnumUtil.SOFT_DATA_FORM.class, refForeignKey = "value", value = "description", required = false) + public Integer softDataType; } From b303cf9a145f9d5f12792683a533e04f2a82c865 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 21 May 2020 16:54:35 +0800 Subject: [PATCH 28/30] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 8ef99a3..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 577686d..807bef5 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index f714b7d..b948580 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index b7991cc..e12eaee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 0648e9f..c338f71 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index f10cf39..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 3b9e57a..7637865 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index b1911ec..d98b7d8 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 56d54cb..bf96e57 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 830caa5..a758a6a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index fb51da0..efacfd2 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 78bbdef..dba12cc 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index fb44d00..81670b2 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index dc4ea86..26a7311 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 8571a5f..eaf2544 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index e36258d..0f615b6 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 9915420..9e5f745 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 61027b2..0fea52b 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index c2104bf..cc8fce6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 999a415d27abd191c80529f25a183cdfaca81d91 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 21 May 2020 18:04:51 +0800 Subject: [PATCH 29/30] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 807bef5..9f9717e 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b948580..a9e288f 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index e12eaee..a44418c 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index c338f71..2de88b5 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 7637865..50ab2c2 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d98b7d8..7f94617 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index bf96e57..d800ecf 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index a758a6a..60fc467 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index efacfd2..d65e031 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index dba12cc..a785f21 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 81670b2..d6d2f8e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26a7311..0fbfb69 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index eaf2544..76739f9 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0f615b6..0368700 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 9e5f745..b2eedd4 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 0fea52b..5fcd08a 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc8fce6..2eddf76 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 648d8662b53e51e0b7c902f1d619465b7356f87a Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 21 May 2020 19:33:57 +0800 Subject: [PATCH 30/30] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1851=20?= =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=8D=87=E7=BA=A7=E9=85=8D=E7=BD=AE=E5=8F=98?= =?UTF-8?q?=E6=9B=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonRiteRoute.java | 58 ++++++++++++++++++++++ .../pojo/andon/bean/AndonRiteRouteDetail.java | 58 ++++++++++++++++++++++ .../andon/model/AndonRiteRouteDetailModel.java | 50 +++++++++++++++++++ .../IAndonRiteRouteDetailRepository.java | 16 ++++++ .../repository/IAndonRiteRouteRepository.java | 16 ++++++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 46 +++++++++++++++++ 6 files changed, 244 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRiteRouteDetailModel.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteDetailRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java new file mode 100644 index 0000000..882ba39 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRoute.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +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 : ANDON_上升流程配置 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-13 9:53 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_RITE_ROUTE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_上升流程配置") +public class AndonRiteRoute extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5542314911937418047L; + + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; + + @AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_ACTION_TAG.class,refForeignKey = "code",value = "description") + @Column(name = "ANDON_STATUS") + @ApiParam(value = "安灯状态") + private String andonStatus; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心") + private String workCenterCode; + + @Column(name = "MEMO") + @ApiParam(value = "备注") + private String memo; + + @AnnoOutputColumn(hidden = true) + @Column(name = "WORK_CENTER_NAME_RDD") + @ApiParam(value = "工作中心名称") + private String workCenterNameRdd; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java new file mode 100644 index 0000000..b15ee39 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRiteRouteDetail.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +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 : ANDON_上升配置明细 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-13 9:53 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_RITE_ROUTE_DETAIL") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_上升配置明细") +public class AndonRiteRouteDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 8382210828244626428L; + + @Column(name = "RITE_ROUTE_ID") + @ApiParam(value = "上升流程配置ID") + private Long riteRouteId; + + @Column(name = "RP_WHERE") + @ApiParam(value = "通知时间") + private String rpWhere; + + @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description") + @Column(name = "RP_CODE") + @ApiParam(value = "通知方式代码") + private String rpCode; + + @Column(name = "RP_OBJECT_CODE") + @ApiParam(value = "通知对象") + private String rpObjectCode; + + @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_LEVEL.class,refForeignKey = "value",value = "description") + @Column(name = "RP_LEVEL") + @ApiParam(value = "通知级别") + private String rpLevel; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRiteRouteDetailModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRiteRouteDetailModel.java new file mode 100644 index 0000000..efc27bb --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonRiteRouteDetailModel.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: 上升配置明细model + * @Reference: + * @Author: wangjie + * @CreateDate:2019-11-12-10:21 + * @Modify: + **/ +@Data +public class AndonRiteRouteDetailModel implements Serializable { + + private static final long serialVersionUID = 1993963582174708808L; + + @ApiParam(value = "安灯类型") + private String alarmCode; + + @ApiParam(value = "安灯状态") + private String andonStatus; + + @ApiParam(value = "工作中心") + private String workCenterCode; + + @ApiParam(value = "备注") + private String memo; + + @ApiParam(value = "工作中心名称") + private String workCenterNameRdd; + + @ApiParam(value = "上升流程配置ID") + private Long riteRouteId; + + @ApiParam(value = "通知时间") + private String rpWhere; + + @ApiParam(value = "通知方式代码") + private String rpCode; + + @ApiParam(value = "通知对象") + private String rpObjectCode; + + @ApiParam(value = "通知级别") + private String rpLevel; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteDetailRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteDetailRepository.java new file mode 100644 index 0000000..9787cb3 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRouteDetail; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface IAndonRiteRouteDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteRepository.java new file mode 100644 index 0000000..a7bfed3 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonRiteRouteRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRoute; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface IAndonRiteRouteRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 3cc844f..ac2db61 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -988,4 +988,50 @@ public class AndonHqlPack { } return packBean; } + + /** + * 上升流程配置 + * @param riteRoute + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonRiteRoute(AndonRiteRoute riteRoute, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(riteRoute, organizeCode); + if (!StringUtils.isEmpty(riteRoute.getAlarmCode())) { + DdlPreparedPack.getStringLikerPack(riteRoute.getAlarmCode(), "alarmCode", packBean); + } + if (!StringUtils.isEmpty(riteRoute.getAndonStatus())) { + DdlPreparedPack.getStringEqualPack(riteRoute.getAndonStatus(), "andonStatus", packBean); + } + if (!StringUtils.isEmpty(riteRoute.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(riteRoute.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(riteRoute.getWorkCenterNameRdd())) { + DdlPreparedPack.getStringLikerPack(riteRoute.getWorkCenterNameRdd(), "workCenterNameRdd", packBean); + } + return packBean; + } + + /** + * 上升配置明细 + * @param riteRouteDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonRiteRouteDetail(AndonRiteRouteDetail riteRouteDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(riteRouteDetail, organizeCode); + if (!StringUtils.isEmpty(riteRouteDetail.getRiteRouteId())) { + DdlPreparedPack.getNumEqualPack(riteRouteDetail.getRiteRouteId(), "riteRouteId", packBean); + } + if (!StringUtils.isEmpty(riteRouteDetail.getRpCode())) { + DdlPreparedPack.getStringEqualPack(riteRouteDetail.getRpCode(), "rpCode", packBean); + } + if (!StringUtils.isEmpty(riteRouteDetail.getRpLevel())) { + DdlPreparedPack.getStringEqualPack(riteRouteDetail.getRpLevel(), "rpLevel", packBean); + } + if (!StringUtils.isEmpty(riteRouteDetail.getRpObjectCode())) { + DdlPreparedPack.getStringLikerPack(riteRouteDetail.getRpObjectCode(), "rpObjectCode", packBean); + } + return packBean; + } }