From 8ebc96d1f7da49bc252ef6cbf616894976b1cb2f Mon Sep 17 00:00:00 2001 From: nies Date: Tue, 15 Mar 2022 17:35:39 +0800 Subject: [PATCH 01/49] =?UTF-8?q?sysMessage=20=E6=9F=A5=E8=AF=A2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0organizeCode=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 5 +++++ 1 file changed, 5 insertions(+) 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 c507260..60e2dec 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 @@ -475,6 +475,9 @@ public class CoreHqlPack { DdlPreparedPack.getNumEqualPack(message.getMessageSoftType(), "messageSoftType", ddlPackBean); DdlPreparedPack.getNumEqualPack(message.getSendStatus(), "sendStatus", ddlPackBean); + DdlPreparedPack.getStringEqualPack(message.getOrganizeCode(), "organizeCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(message.getMessageReceiversId(), "messageReceiversId", ddlPackBean); + DdlPreparedPack.getOrderDefault(message); ddlPackBean.setOrderByStr(message.orderBy()); @@ -857,6 +860,8 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(), "receiverTime", result); HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(), "receiverId", result); + HqlPack.getStringEqualPack(sysRefUserMessage.getOrganizeCode(), "organizeCode", result); + // 添加默认排序 HqlPack.getOrderDefault(sysRefUserMessage); From 34df681f3759bcdf5b48029939687edc001f7723 Mon Sep 17 00:00:00 2001 From: nies Date: Fri, 18 Mar 2022 09:35:34 +0800 Subject: [PATCH 02/49] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A8=A1=E6=9D=BF=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/platform/bean/SysTableTemplate.java | 46 ++++++++++++++++++++++ .../repository/SysTableTemplateRepository.java | 11 ++++++ 2 files changed, 57 insertions(+) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTableTemplate.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTableTemplateRepository.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTableTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTableTemplate.java new file mode 100644 index 0000000..2bf64f7 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTableTemplate.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * @author ns + * @create 2022/3/17 0017 上午 10:33 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_TABLE_TEMPLATE",uniqueConstraints = @UniqueConstraint(columnNames = {"soft_type", "page"})) +@ApiModel(value="自定义表格结构",description = "自定义表格结构") +public class SysTableTemplate extends BaseBean { + /** + * 产品类型 属于哪个产品 + */ + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品类型", example = "0",access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp") + @AnnoOutputColumn + private Integer softType; + + @Column(name="PAGE") + @ApiParam(value ="表格所属页面") + private String page; + + @Column(name="TEMPLATE_TYPE") + @ApiParam(value ="模板类型") + private String templateType; + + @Lob + @Column(name="TEMPLATE_DATA") + @ApiParam(value ="模板数据") + private String templateData; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTableTemplateRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTableTemplateRepository.java new file mode 100644 index 0000000..669e22d --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTableTemplateRepository.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysTableTemplate; + +/** + * @author ns + * @create 2022/3/17 0017 上午 10:51 + */ +public interface SysTableTemplateRepository extends BaseRepository { +} From 3088b05027f8401cf2f6eb21772c447531cfa6b4 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Wed, 23 Mar 2022 16:22:55 +0800 Subject: [PATCH 03/49] =?UTF-8?q?sweb=E7=BB=9F=E4=B8=80=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 66 +++++++++++++++++++++- .../pojo/model/platform/UserDetailModel.java | 5 +- .../estsh/i3plus/pojo/platform/bean/SysUser.java | 6 ++ 3 files changed, 75 insertions(+), 2 deletions(-) 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 947138e..2b48693 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 @@ -94,7 +94,12 @@ public class CommonEnumUtil { /** * 智能调度系统 */ - LEO(50, 8234, 0, 106000000L, "impp-leo", "智能调度系统"); + LEO(50, 8234, 0, 106000000L, "impp-leo", "智能调度系统"), + + /** + * SWEB调用 + */ + SWEB_VENDOR(666,8810,0,0,"sweb-vendor","供应商客户端服务"); /** * 产品ID @@ -1059,7 +1064,66 @@ public class CommonEnumUtil { return tmp; } } + /** + * 客户端授权子系统标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AUTH_PLATFORM { + PC_IMPP_CORE(10, "PC-IMPP", "PC平台管理端"), + PC_WMS_SWEB(20, "PC-SWEB", "PC_SWEB后台管理端"); + + + private int value; + private String name; + private String description; + + AUTH_PLATFORM() { + } + + AUTH_PLATFORM(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + public String getDescription() { + return description; + } + + public String getName() { + return name; + } + + public static AUTH_PLATFORM valueOf(int val) { + AUTH_PLATFORM tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i]; + } + } + return tmp; + } + + /** + * -1 未识别操作系统 + * + * @param desc + * @return + */ + public static int descOf(String desc) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } +} /** * 用户登录状态 */ diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java index 5054632..901f40b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java @@ -163,6 +163,9 @@ public class UserDetailModel extends BaseBean { @ApiParam(value ="登录次数") private Integer userLoginNum; + @ApiParam(value = "登录平台权限") + private String authPlatform; + public SysUser getSysUser(){ SysUser user = new SysUser(); user.setId(!StringUtils.isBlank(this.userId) ? Long.parseLong(this.userId) : null); @@ -176,7 +179,7 @@ public class UserDetailModel extends BaseBean { user.setLanguageCode(this.userLanguageCode); user.setOrganizeCode(this.organizeCode); user.setUserLoginNum(this.userLoginNum); - + user.setAuthPlatform(this.authPlatform); return user; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 2e48409..ca1d071 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -97,6 +97,12 @@ public class SysUser extends BaseBean { @ApiParam(value = "账号最后登录时间") private String userLoginLastDateTime; + /** + * 枚举类型 + */ + @Column(name = "AUTH_PLATFORM") + @ApiParam(value = "账号授权的应用列表") + private String authPlatform; /********************************** 关系信息 ********************************/ @Column(name = "DEPARTMENT_ID") From 0e5d45d477467dceeeced0111eb814ae0ec4e5f0 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 25 Mar 2022 15:34:51 +0800 Subject: [PATCH 04/49] =?UTF-8?q?sweb=E4=BE=9B=E5=BA=94=E5=95=86=E8=87=AA?= =?UTF-8?q?=E5=8A=A9=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/model/common/ImppEmail.java | 29 ++++++++++++++++++++++ .../estsh/i3plus/pojo/model/common/UserModel.java | 21 ++++++++++++++++ .../sweb/modelbean/SwebUpdateVendorPwdModel.java | 29 ++++++++++++++++++++++ .../pojo/sweb/modelbean/SwebVerifyVendorModel.java | 24 ++++++++++++++++++ 4 files changed, 103 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppEmail.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/UserModel.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebUpdateVendorPwdModel.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebVerifyVendorModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppEmail.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppEmail.java new file mode 100644 index 0000000..b29e63c --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppEmail.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.model.common; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/3/24 1:00 + * @Modify: + **/ +@Data +@ApiModel(value = "平台发送邮件model") +public class ImppEmail { + + @ApiModelProperty(value = "邮箱") + private String email; + + @ApiModelProperty(value = "消息内容") + private String content; + + @ApiModelProperty(value = "subject") + private String subject; + + @ApiModelProperty(value = "nick") + private String nick; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/UserModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/UserModel.java new file mode 100644 index 0000000..77a1f67 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/UserModel.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.model.common; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/3/24 15:24 + * @Modify: + **/ +@Data +@ApiModel(value = "供应商忘记密码") +public class UserModel { + @ApiModelProperty("登录名") + private String loginName; + @ApiModelProperty("新密码") + private String password; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebUpdateVendorPwdModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebUpdateVendorPwdModel.java new file mode 100644 index 0000000..be530c7 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebUpdateVendorPwdModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/3/24 16:20 + * @Modify: + **/ +@Data +@ApiModel("供应商自助修改密码") +public class SwebUpdateVendorPwdModel { + + @ApiModelProperty("供应商登录名") + private String loginName; + + @ApiModelProperty("供应商邮箱") + private String email; + + @ApiModelProperty("供应商新密码") + private String password; + + @ApiModelProperty("验证码") + private String authCode; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebVerifyVendorModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebVerifyVendorModel.java new file mode 100644 index 0000000..2111b3b --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebVerifyVendorModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/3/23 22:54 + * @Modify: + **/ +@Data +@ApiModel(value = "供应商验证对象") +public class SwebVerifyVendorModel { + + @ApiModelProperty(value = "供应商登录名") + private String loginName; + + @ApiModelProperty(value = "供应商邮箱") + private String email; + +} From 5bea74bf80813268367218ef49fd393dc68d1772 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Sun, 27 Mar 2022 23:23:52 +0800 Subject: [PATCH 05/49] =?UTF-8?q?sweb=E4=BE=9B=E5=BA=94=E5=95=86=E8=87=AA?= =?UTF-8?q?=E5=8A=A9=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81---=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E7=99=BB=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2b48693..d7b82d0 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 @@ -1070,7 +1070,7 @@ public class CommonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AUTH_PLATFORM { PC_IMPP_CORE(10, "PC-IMPP", "PC平台管理端"), - PC_WMS_SWEB(20, "PC-SWEB", "PC_SWEB后台管理端"); + PC_WMS_SWEB(20, "PC-SWEB", "PC_SWEB供应商客户端"); private int value; From e01f9a5570a91f6acaa99b8973a09c0b5846978e Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Tue, 29 Mar 2022 15:55:56 +0800 Subject: [PATCH 06/49] =?UTF-8?q?=E9=9B=86=E4=B8=AD=E5=AF=B9=E8=B4=A6?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/dto/WmsAccountDto.java | 40 ++++++++++++++++++++++ .../pojo/wms/modelbean/AccountReportModel.java | 27 +++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsAccountDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AccountReportModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsAccountDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsAccountDto.java new file mode 100644 index 0000000..54e29c3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsAccountDto.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/3/29 14:37 + * @Modify: + **/ +@ApiModel(value = "统一对账单") +@Data +public class WmsAccountDto { + @ApiModelProperty(value = "零件名称") + private String partName; + @ApiModelProperty(value = "仓库名称") + private String warehouseName; + @ApiModelProperty(value = "区域名称") + private String zonesName; + + private BigDecimal wmsInitStockNum; + + private BigDecimal sapInitStockNum; + + private BigDecimal wmsAvailableNum; + + private BigDecimal wmsCogi; + + private BigDecimal sapAvailableNum; + + private BigDecimal sapCogi; + + private BigDecimal difference; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AccountReportModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AccountReportModel.java new file mode 100644 index 0000000..22c44be --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AccountReportModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/3/29 9:51 + * @Modify: + **/ +@Data +@ApiModel(value = "集中对账单") +public class AccountReportModel { + @ApiModelProperty(value = "物料号") + public String partNo; + @ApiModelProperty(value = "仓库号") + public String whNo; + @ApiModelProperty(value = "库存地") + public String zoneNo; + @ApiModelProperty(value = "wms快照时间") + public String wmsSnapshotTime; + @ApiModelProperty(value = "SAP快照时间") + public String sapSnapshotTime; +} From f843878e7e66504d1bce8a6d7bedc73bdf702a90 Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 30 Mar 2022 15:07:09 +0800 Subject: [PATCH 07/49] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=92=89=E9=92=89?= =?UTF-8?q?=E5=8D=95=E8=81=8A=E6=9C=BA=E5=99=A8=E4=BA=BA=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E7=9A=84model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/eam/bean/BaseBean.java | 8 +++++++ .../model/platform/DingSendBatchRequestModel.java | 28 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/bean/BaseBean.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/bean/BaseBean.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/bean/BaseBean.java new file mode 100644 index 0000000..18cdf00 --- /dev/null +++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/bean/BaseBean.java @@ -0,0 +1,8 @@ +package cn.estsh.i3plus.pojo.eam.bean; + +/** + * @author ns + * @create 2022/3/28 0028 下午 14:11 + */ +public class BaseBean { +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java new file mode 100644 index 0000000..0f1cf1a --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @author ns + * @create 2022/3/30 0030 上午 10:12 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("钉钉单聊机器人批量推送消息") +public class DingSendBatchRequestModel { + + @ApiModelProperty(value ="手机号" , access ="手机号") + private List phoneNumberList ; + @ApiModelProperty(value ="消息标题" , access ="消息标题") + private String title ; + @ApiModelProperty(value ="消息内容" , access ="消息内容") + private String content; + +} From 4c57d9e9b3d37b7ebc167721054eae545235a2fe Mon Sep 17 00:00:00 2001 From: nies Date: Fri, 1 Apr 2022 19:08:31 +0800 Subject: [PATCH 08/49] =?UTF-8?q?=E4=BF=AE=E6=94=B9SysTableTemplate?= =?UTF-8?q?=E7=B4=A2=E5=BC=95=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/bean/SysTableTemplate.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTableTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTableTemplate.java index 2bf64f7..ff8b95e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTableTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTableTemplate.java @@ -20,7 +20,10 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_TABLE_TEMPLATE",uniqueConstraints = @UniqueConstraint(columnNames = {"soft_type", "page"})) +@Table(name="SYS_TABLE_TEMPLATE",indexes = + { + @Index(name="page",columnList = "page"), + }) @ApiModel(value="自定义表格结构",description = "自定义表格结构") public class SysTableTemplate extends BaseBean { /** From f7a8acb88b75b7f0ffe9420ca0745ba62faeedd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=8B=E9=B8=BF=E8=BE=89?= <2579728558@qq.com> Date: Tue, 12 Apr 2022 15:57:29 +0800 Subject: [PATCH 09/49] =?UTF-8?q?MesPartStockSchedule(=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=85=8D=E7=BD=AE)=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=B7=B2=E4=B8=8B=E8=BE=BE=E7=AE=B1=E6=95=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index 8c9277e..bc9d529 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -94,6 +94,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { @ApiParam("最小下达批次") private Integer minGenLot; + @Column(name = "ALREADY_LANDED_QTY") + @ApiParam("已下达箱数") + private Integer alreadyLandedQty; + @Transient @ApiParam("已下达箱数") private Integer alreadyLandedNum; From 8cd30d3bc81bb551d2f1015da408676894c2b7d5 Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 13 Apr 2022 15:56:39 +0800 Subject: [PATCH 10/49] =?UTF-8?q?=E4=BF=AE=E6=94=B9eam=E7=AB=AF=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d7b82d0..fb7d832 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 @@ -69,7 +69,7 @@ public class CommonEnumUtil { APS_3(38, 18400, 26, 190000000L, "i3aps-3", "高级计划与排产-3"), APS_4(48, 8400, 27, 200000000L, "i3aps-4", "高级计划与排产-4"), SURFACE(98, 0, 0, 0, "i3surface", "对外服务"), - EAM(108, 8500, 28, 210000000L, "eam", "设备信息管理服务"), + EAM(108, 8550, 28, 210000000L, "eam", "设备信息管理服务"), /** * 基础服务 From fcff103a4d1ec31fd667b89edd9ff32a2c7888f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=8B=E9=B8=BF=E8=BE=89?= <2579728558@qq.com> Date: Wed, 20 Apr 2022 12:10:33 +0800 Subject: [PATCH 11/49] =?UTF-8?q?MesPartFormula=20=E7=89=A9=E6=96=99?= =?UTF-8?q?=E9=85=8D=E6=96=B9=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=8F=82=E7=85=A7?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java index 3c782f6..efbd139 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java @@ -53,4 +53,8 @@ public class MesPartFormula extends BaseBean implements Serializable { @ApiParam("配方类型") private Integer formulaType; + @Column(name = "REFER_QTY") + @ApiParam("参照数量") + private Integer referQty; + } From 0ca309e38bf50ee2e1d353d93bb9d9dd90a50f05 Mon Sep 17 00:00:00 2001 From: nies Date: Fri, 22 Apr 2022 15:48:59 +0800 Subject: [PATCH 12/49] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E5=85=B3?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 1 + 1 file changed, 1 insertion(+) 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 fb7d832..1332433 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 @@ -27,6 +27,7 @@ public class CommonEnumUtil { SWEB(7, 8800, 19, 108000000L, "i3sweb", "供应商服务"), QMS(5, 8260, 29, 128000000L, "i3qms", "质量管理软件"), TMS(101, 8250, 24, 118000000L, "i3tms", "运输管理系统"), + CDM(102, 8270, 30, 138000000L, "i3cdm", "报关管理系统"), /** * Mes 服务 From 37d7b461f6a7f26030735117b96d28aebb45dab0 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Wed, 27 Apr 2022 14:16:53 +0800 Subject: [PATCH 13/49] =?UTF-8?q?=E6=B7=BB=E5=8A=A0soft=5Ftype=EF=BC=8Ceam?= =?UTF-8?q?=5Fpad?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 4 ++++ 1 file changed, 4 insertions(+) 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 1332433..33ff8cb 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 @@ -96,6 +96,10 @@ public class CommonEnumUtil { * 智能调度系统 */ LEO(50, 8234, 0, 106000000L, "impp-leo", "智能调度系统"), + /** + * EAM_PAD + */ + EAM_PAD(109, 8500, 28, 211000000L, "eam-pad", "设备信息管理服务pad"), /** * SWEB调用 From 187c1382ca0a5316ec641b6f340a5dba15fd19ce Mon Sep 17 00:00:00 2001 From: nies Date: Thu, 28 Apr 2022 13:46:49 +0800 Subject: [PATCH 14/49] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 48 ++++++++++++++++++++++ .../estsh/i3plus/pojo/platform/bean/SysUser.java | 7 ++++ 2 files changed, 55 insertions(+) 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 33ff8cb..6932c7a 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 @@ -2847,4 +2847,52 @@ public class CommonEnumUtil { } + + /** + * 用户账号类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum USER_ACCOUNT_TYPE { + SYSTEM_USER(10, "系统用户"), + SWEB_USER(20, "sweb用户"); + + private int value; + private String description; + + USER_ACCOUNT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + + public static Integer descriptionOfValue(String desc) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index ca1d071..0353f26 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -103,6 +103,13 @@ public class SysUser extends BaseBean { @Column(name = "AUTH_PLATFORM") @ApiParam(value = "账号授权的应用列表") private String authPlatform; + + /** + * 枚举类型 + */ + @Column(name = "USER_ACCOUNT_TYPE") + @ApiParam(value = "用户账号类型") + private String userAccountType; /********************************** 关系信息 ********************************/ @Column(name = "DEPARTMENT_ID") From dfe93ff37eae7387e618612180550860b41ec95f Mon Sep 17 00:00:00 2001 From: nies Date: Thu, 28 Apr 2022 17:34:38 +0800 Subject: [PATCH 15/49] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 27 ++++++++++++++-------- .../pojo/model/platform/UserDetailModel.java | 6 +++++ 2 files changed, 24 insertions(+), 9 deletions(-) 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 6932c7a..7263ba4 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 @@ -2853,18 +2853,18 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum USER_ACCOUNT_TYPE { - SYSTEM_USER(10, "系统用户"), - SWEB_USER(20, "sweb用户"); + SYSTEM("SYSTEM", "系统用户"), + SWEB("SWEB", "sweb用户"); - private int value; + private String value; private String description; - USER_ACCOUNT_TYPE(int value, String description) { + USER_ACCOUNT_TYPE(String value, String description) { this.value = value; this.description = description; } - public int getValue() { + public String getValue() { return value; } @@ -2872,19 +2872,28 @@ public class CommonEnumUtil { return description; } - public static String valueOf(int val) { + public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equalsIgnoreCase(val)) { tmp = values()[i].description; } } return tmp; } + public static USER_ACCOUNT_TYPE valueOfEnum(String val) { + USER_ACCOUNT_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equalsIgnoreCase(val)) { + tmp = values()[i]; + } + } + return tmp; + } - public static Integer descriptionOfValue(String desc) { - Integer tmp = null; + public static String descriptionOfValue(String desc) { + String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].description.equals(desc)) { tmp = values()[i].value; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java index 901f40b..571f83b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java @@ -166,6 +166,11 @@ public class UserDetailModel extends BaseBean { @ApiParam(value = "登录平台权限") private String authPlatform; + + @ApiParam(value = "账号类型") + private String userAccountType; + + public SysUser getSysUser(){ SysUser user = new SysUser(); user.setId(!StringUtils.isBlank(this.userId) ? Long.parseLong(this.userId) : null); @@ -180,6 +185,7 @@ public class UserDetailModel extends BaseBean { user.setOrganizeCode(this.organizeCode); user.setUserLoginNum(this.userLoginNum); user.setAuthPlatform(this.authPlatform); + user.setUserAccountType(this.userAccountType); return user; } From 05d789ea643a1f9b889912de410a519b8aa84c74 Mon Sep 17 00:00:00 2001 From: "baoyu.wang" Date: Thu, 5 May 2022 14:33:07 +0800 Subject: [PATCH 16/49] =?UTF-8?q?wms=E7=89=A9=E6=96=99=E5=AD=90=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E9=A1=B9=E5=A2=9E=E5=8A=A0=E5=8A=A8=E6=80=81=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java index ab61c0d..8b7d700 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -81,5 +81,6 @@ public class WmsPartItemCheck extends BaseBean { @Column(name = "INPUT_METHOD") @ApiParam("录入方式") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer inputMethod; } From f4c3656ad78f442d930ad5776e28bb0cdea18974 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 8 May 2022 19:36:03 +0800 Subject: [PATCH 17/49] =?UTF-8?q?andon=20=E6=A0=B8=E5=BF=83=E5=8C=85=20?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/andon/bean/AndonConfig.java | 41 +++++++--- .../andon/bean/AndonManageRouteErrorRecord.java | 88 ++++++++++++++++++++++ .../model/AndonManageRouteErrorRecordModel.java | 36 +++++++++ .../cn/estsh/i3plus/pojo/andon/model/FsmModel.java | 75 ++++++++++++++++++ .../pojo/andon/model/StationRequestBean.java | 47 ++++++++++++ .../pojo/andon/model/StationRequestBeanAb.java | 88 ++++++++++++++++++++++ .../IAndonManageRouteErrorRecordRepository.java | 16 ++++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 14 ++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 79 +++++++++++++++++++ 9 files changed, 472 insertions(+), 12 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonManageRouteErrorRecordModel.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonManageRouteErrorRecordRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java index c2aa413..9a27fa0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java @@ -38,30 +38,47 @@ public class AndonConfig extends BaseBean implements Serializable { @ApiParam(value ="名称") private String name; - @Column(name="CONFIG_TYPE") - @ApiParam(value ="参数类型ID（枚举：1.系统配置...）" , example ="-1") - private Integer configType; - @Column(name="CONFIG_CODE") @ApiParam(value ="参数代码") private String configCode; - // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP - @Column(name="CONFIG_GROUP") - @ApiParam(value ="参数组") - private Integer configGroup; + @Column(name="CONFIG_DESCRIPTION") + @ApiParam(value ="参数描述") + private String configDescription; + + @Column(name="CONFIG_KEY") + @ApiParam(value ="参数键") + private String configKey; + + @Column(name="CONFIG_KEY_NAME") + @ApiParam(value ="参数键描述") + private String configKeyName; - // 枚举 ImppEnumUtil.SYS_VALUE_TYPE @Column(name="CONFIG_VALUE_TYPE") @ApiParam(value ="参数值类型") private String configValueType; + @Column(name="CONFIG_VALUE_TYPE_NAME") + @ApiParam(value ="参数值类型描述") + private String configValueTypeName; + @Column(name="CONFIG_VALUE") @ApiParam(value ="参数值") private String configValue; - @Column(name="CONFIG_DESCRIPTION") - @ApiParam(value ="参数描述") - private String configDescription; + @Column(name="CONFIG_VALUE_DESC") + @ApiParam(value ="参数值描述") + private String configValueDesc; + + //******以下不用了******* + @Column(name="CONFIG_TYPE") + @ApiParam(value ="参数类型ID（枚举：1.系统配置...）" , example ="-1") + private Integer configType; + + // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP + @Column(name="CONFIG_GROUP") + @ApiParam(value ="参数组") + private Integer configGroup; + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java new file mode 100644 index 0000000..8e3ff3c --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java @@ -0,0 +1,88 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_MANAGE_ROUTE_ERROR_RECORD", indexes = { + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WORK_CELL_CODE"), + @Index(columnList = "WORK_CENTER_CODE, WORK_CELL_CODE"), + @Index(columnList = "ANDON_ORDER_NO"), + @Index(columnList = "MSG_TYPE"), + @Index(columnList = "WORK_CENTER_CODE, WORK_CELL_CODE, ANDON_ORDER_NO"), + @Index(columnList = "WORK_CENTER_CODE, WORK_CELL_CODE, HANDLE_STATUS") +}) +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Api("安灯作业流程异常记录") +public class AndonManageRouteErrorRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2037562788825472674L; + + @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 = "ALARM_DETAIL_CODE") + @ApiParam(value = "安灯子类型编码") + private String alarmDetailCode; + + @Column(name = "SOURCE_TYPE") + @ApiParam(value = "安灯来源类型") + private String sourceType; + + @Column(name = "ALARM_STATUS") + @ApiParam(value = "安灯事件") + public String alarmStatus; + + @Column(name = "ALARM_STATUS_NAME") + @ApiParam(value = "安灯事件名称") + public String alarmStatusName; + + @Lob + @Column(name = "ERROR_DESC") + @ApiParam(value = "异常描述") + public String errorDesc; + + @Column(name = "MSG_TYPE") + @ApiParam(value = "信息类型") + private String msgType; + + @Column(name = "ANDON_ORDER_NO") + @ApiParam(value = "安灯队列编号") + public String andonOrderNo; + + @Column(name = "FSM_CACHED_KEY") + @ApiParam(value = "缓存KEY") + private String fsmCachedKey; + + @Column(name = "HANDLE_STATUS") + @ApiParam(value = "处理状态") + private Integer handleStatus; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonManageRouteErrorRecordModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonManageRouteErrorRecordModel.java new file mode 100644 index 0000000..bf54e47 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonManageRouteErrorRecordModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import cn.estsh.i3plus.pojo.andon.bean.AndonManageRouteErrorRecord; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ +@Data +@ApiModel("安灯作业流程异常记录model") +public class AndonManageRouteErrorRecordModel extends AndonManageRouteErrorRecord implements Serializable { + + private static final long serialVersionUID = -3351535059161071801L; + + @ApiParam("安灯类型名称") + private String alarmName; + + @ApiParam(value = "安灯子类型名称") + private String alarmDetailName; + + @ApiParam(value = "安灯来源类型") + private String sourceTypeName; + + @ApiParam(value = "信息类型") + private String msgTypeName; + + @ApiParam(value = "处理状态") + private String handleStatusName; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java new file mode 100644 index 0000000..1c5d24a --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@ApiModel("状态点model") +public class FsmModel implements Serializable { + + private static final long serialVersionUID = -6578122778434730384L; + + @ApiParam("流程代码") + private String routeCode; + + @ApiParam("状态代码") + private String statusCode; + + @ApiParam("状态名称") + private String statusName; + + @ApiParam("下一状态") + private String nextStatus; + + @ApiParam("触发类型") + private Integer triggerType; + + @ApiParam("触发事件") + private String triggerEvent; + + @ApiParam("触发条件（MVEL）") + private String triggerWhere; + + @ApiParam("触发调用") + private Long actionAmgId; + + @ApiParam("进入状态调用") + private Long inAmgId; + + @ApiParam("离开状态调用") + private Long outAmgId; + + @ApiParam("状态类型") + private Integer statusType; + + @ApiParam("安灯类型代码") + private String alarmCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("流程类型") + private Integer routeType; + + @ApiParam("界面编号") + private String interfaceNo; + + @ApiParam("安灯流程ID") + private Long alarmRouteId; + + @ApiParam("进入触发方法时默认不需要校验外部触发") + private boolean checkTriggerTypeFalg = false; + + @ApiParam("下个触发事件") + private String nextTriggerEvent; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java new file mode 100644 index 0000000..9df0a79 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : 工位请求bean + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-19 + * @Modify: + **/ +@Data +public class StationRequestBean extends StationRequestBeanAb implements Serializable { + + private static final long serialVersionUID = -3122891627710528829L; + + @ApiParam("组织代码") + private String organizeCodeExt = "test"; + + @Override + public String toString() { + return "StationRequestBean{" + + "actorReceiveStrategyClass='" + get(actorReceiveStrategyClass) + '\'' + + ", stationRequestBeanAbClass='" + get(stationRequestBeanAbClass) + '\'' + + ", fsmCachedKey='" + get(fsmCachedKey) + '\'' + + ", organizeCode='" + get(organizeCode) + '\'' + + ", userInfo='" + get(userInfo) + '\'' + + ", msgType='" + get(msgType) + '\'' + + ", areaCode='" + get(areaCode) + '\'' + + ", workCenterCode='" + get(workCenterCode) + '\'' + + ", workCellCode='" + get(workCellCode) + '\'' + + ", alarmCode='" + get(alarmCode) + '\'' + + ", sourceType='" + get(sourceType) + '\'' + + ", alarmDetailCode='" + get(alarmDetailCode) + '\'' + + ", andonOrderNo='" + get(andonOrderNo) + '\'' + + ", msgData=" + get(msgData) + + ", fsmList=" + get(fsmList) + + ", curFsm=" + get(curFsm) + + ", triggerEvent='" + get(triggerEvent) + '\'' + + ", organizeCodeExt='" + get(organizeCodeExt) + '\'' + + '}'; + } + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java new file mode 100644 index 0000000..ef772de --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java @@ -0,0 +1,88 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Description : 工位请求bean + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-19 + * @Modify: + **/ +@Data +public abstract class StationRequestBeanAb implements Serializable { + + private static final long serialVersionUID = -8537547029096794087L; + + @ApiParam("ACTOR接收策略类名") + public String actorReceiveStrategyClass; + + @ApiParam("工位请求bean子类") + public String stationRequestBeanAbClass; + + @ApiParam("缓存数据KEY") + public String fsmCachedKey; + + @ApiParam("组织代码") + public String organizeCode; + + @ApiParam("用户信息") + public String userInfo; + + @ApiParam("消息类型") + public String msgType; + + @ApiParam("区域代码") + public String areaCode; + + @ApiParam("工作中心代码") + public String workCenterCode; + + @ApiParam("工作单元代码") + public String workCellCode; + + @ApiParam(value = "安灯类型") + public String alarmCode; + + @ApiParam(value = "安灯来源类型") + public String sourceType; + + @ApiParam(value = "安灯子类型编码") + public String alarmDetailCode; + + @ApiParam(value = "安灯队列编号") + public String andonOrderNo; + + @ApiParam(value = "安灯事件") + public String alarmStatus; + + @ApiParam(value = "安灯事件名称(呼叫 响应 解决 撤销 等)") + public String alarmStatusName; + + @ApiParam("消息数据") + public Map msgData = new HashMap<>(); + + @ApiParam("流程状态集合") + public List fsmList; + + @ApiParam("当前流程状态") + public FsmModel curFsm; + + @ApiParam("当前触发事件") + public String triggerEvent; + + public String get(Object obj) { + if (null == obj) { + return ""; + } else { + return obj.toString(); + } + } + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonManageRouteErrorRecordRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonManageRouteErrorRecordRepository.java new file mode 100644 index 0000000..37161d4 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonManageRouteErrorRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonManageRouteErrorRecord; +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 IAndonManageRouteErrorRecordRepository 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 0a111a3..9162515 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 @@ -1114,4 +1114,18 @@ public class AndonHqlPack { getStringBuilderPack(andonPlcColorCfg, result); return result; } + + /** + * 安灯异常记录 + * @param record + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonManageRouteErrorRecord(AndonManageRouteErrorRecord record, String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(record.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(record.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringLikerPack(record.getAndonOrderNo(), "andonOrderNo", 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 5e86d59..8e6be1e 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 @@ -1679,4 +1679,83 @@ public class AndonEnumUtil { return tmp; } } + + /** + * redis过期时间 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EXPIRE_TIME { + + NEVER(-1, "不过期"), + ONE_HOUR(3600, "一小时"), + FIVE_MINS(300, "5分钟"), + HALF_HOUR(1800, "半小时"), + ONE_QUARTER(900, "一刻钟"), + ONE_MIN(60, "一分钟"); + + private int value; + private String description; + + EXPIRE_TIME(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + 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 FSM_ERROR_MSG_TYPE { + + USER("10", "用户"), + SYS("20", "系统"); + + private String value; + private String description; + + FSM_ERROR_MSG_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 7487be0a8a0a8da0af3ef8b3727f78faeb4293e5 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 9 May 2022 11:03:03 +0800 Subject: [PATCH 18/49] =?UTF-8?q?=E5=AE=89=E7=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java | 5 +---- .../java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java | 3 +++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java index 8e3ff3c..1794089 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java @@ -85,4 +85,8 @@ public class AndonManageRouteErrorRecord extends BaseBean implements Serializabl @ApiParam(value = "处理状态") private Integer handleStatus; + @Column(name = "ALARM_ERROR_TIME") + @ApiParam("安灯异常时间") + public String alarmErrorTime; + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java index 9df0a79..ac70dd0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java @@ -17,9 +17,6 @@ public class StationRequestBean extends StationRequestBeanAb implements Serializ private static final long serialVersionUID = -3122891627710528829L; - @ApiParam("组织代码") - private String organizeCodeExt = "test"; - @Override public String toString() { return "StationRequestBean{" + @@ -40,7 +37,7 @@ public class StationRequestBean extends StationRequestBeanAb implements Serializ ", fsmList=" + get(fsmList) + ", curFsm=" + get(curFsm) + ", triggerEvent='" + get(triggerEvent) + '\'' + - ", organizeCodeExt='" + get(organizeCodeExt) + '\'' + + ", alarmErrorTime='" + get(alarmErrorTime) + '\'' + '}'; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java index ef772de..5035598 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java @@ -77,6 +77,9 @@ public abstract class StationRequestBeanAb implements Serializable { @ApiParam("当前触发事件") public String triggerEvent; + @ApiParam("安灯异常时间") + public String alarmErrorTime; + public String get(Object obj) { if (null == obj) { return ""; From e3373387d27fc4d03bdfc89a770492fb4183369e Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 9 May 2022 11:37:38 +0800 Subject: [PATCH 19/49] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../andon/model/AndonStatusInterfaceCfgModel.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonStatusInterfaceCfgModel.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonStatusInterfaceCfgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonStatusInterfaceCfgModel.java new file mode 100644 index 0000000..18fd5bb --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonStatusInterfaceCfgModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ +@Data +@ApiModel("安灯事件界面配置MODEL") +public class AndonStatusInterfaceCfgModel implements Serializable { + + private static final long serialVersionUID = -4504617079257753276L; + + @ApiParam("界面代码") + private String value; + + @ApiParam("界面名称") + private String description; + +} From f25fa6a2a6932138b7dac8218998ca77a8944692 Mon Sep 17 00:00:00 2001 From: nies Date: Tue, 10 May 2022 16:54:38 +0800 Subject: [PATCH 20/49] =?UTF-8?q?=E6=96=B0=E5=A2=9EuserAccountType?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 2 ++ 1 file changed, 2 insertions(+) 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 60e2dec..68a0c4c 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 @@ -594,6 +594,8 @@ public class CoreHqlPack { DdlPreparedPack.getStringLikerPack(user.getUserEmpNo(), "userEmpNo", result); // DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getStringEqualPack(user.getUserAccountType(), "userAccountType", result); + DdlPreparedPack.getInPackList(idList, "id", result); result.setOrderByStr(user.orderBy()); From d1698aaa487f0a0cac5535413c8933ca9c36255c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 10 May 2022 23:20:25 +0800 Subject: [PATCH 21/49] andon --- .../pojo/andon/model/ExcelImportErrorModel.java | 35 +++++++++++++++++ .../pojo/andon/model/ExcelImportResultModel.java | 44 ++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ExcelImportErrorModel.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ExcelImportResultModel.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ExcelImportErrorModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ExcelImportErrorModel.java new file mode 100644 index 0000000..90b4974 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ExcelImportErrorModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.andon.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Author: wangjie + * @CreateDate: 2019/8/21 9:19 AM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("andon导入异常结果model") +public class ExcelImportErrorModel implements Serializable { + + @ApiParam("错误的行号") + private int rowNum; + + @ApiParam("错误数量") + private int errorNum; + + @ApiParam("错误列号") + private String cellNum; + + @ApiParam("错误描述") + private String errorInfo; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ExcelImportResultModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ExcelImportResultModel.java new file mode 100644 index 0000000..89e1642 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ExcelImportResultModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author: wangjie + * @CreateDate: 2019/8/21 9:19 AM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("andon导入结果model") +public class ExcelImportResultModel implements Serializable { + + @ApiParam("结果") + private boolean result; + + @ApiParam("成功行数量") + private int successRowNum; + + @ApiParam("失败行数量") + private int failRowNum; + + @ApiParam("错误信息集合") + private List excelImportErrorModels; + + @ApiParam("错误的行号") + private String errorRows; + + @ApiParam("导入数据集合") + private List excelList; + + @ApiParam("导入进度") + private String importSpeed; + +} From a4314ba22e4159888bdeed83a06bf440a82fd28b Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 11 May 2022 15:03:06 +0800 Subject: [PATCH 22/49] andon --- .../cn/estsh/i3plus/pojo/andon/bean/AndonFile.java | 55 ++++++++++++++++ .../pojo/andon/bean/AndonModuleExcelManage.java | 50 +++++++++++++++ .../i3plus/pojo/andon/model/AndonConfigModel.java | 68 ++++++++++++++++++++ .../andon/model/AndonModuleExcelManageModel.java | 73 ++++++++++++++++++++++ .../andon/repository/IAndonFileRepository.java | 16 +++++ .../IAndonModuleExcelManageRepository.java | 14 +++++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 16 +++++ 7 files changed, 292 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonFile.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonModuleExcelManage.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonModuleExcelManageModel.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonFileRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonModuleExcelManageRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonFile.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonFile.java new file mode 100644 index 0000000..96c5a5e --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonFile.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Author: wangjie + * @CreateDate: 2019/12/4 1:28 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "ANDON_FILE") +@Api("文件表") +public class AndonFile extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5743291150478737944L; + + @Column(name = "FILE_NAME") + @ApiParam("文件名称") + private String fileName; + + @Column(name = "FILE_URL") + @ApiParam("文件URL") + private String fileUrl; + + @Column(name = "GROUP_NAME") + @ApiParam("组名") + private String groupName; + + @Column(name = "FILE_ORIGIN_NAME") + @ApiParam("文件原名") + private String fileOriginName; + + @Column(name = "FILE_SIZE") + @ApiParam("文件大小") + private String fileSize; + + @Column(name = "FILE_TYPE") + @ApiParam("文件类型名称") + private String fileType; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonModuleExcelManage.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonModuleExcelManage.java new file mode 100644 index 0000000..ef1c70b --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonModuleExcelManage.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Author: wangjie + * @CreateDate: 2019/7/30 9:30 AM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "ANDON_MODULE_EXCEL_MANAGE", indexes = { + @Index(columnList = "MODULE_CODE"), + @Index(columnList = "MODULE_NAME") +}) +@Api("模块EXCEL管理表") +public class AndonModuleExcelManage extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4174331010179941394L; + + @Column(name = "MODULE_CODE") + @ApiParam("模块代码") + private String moduleCode; + + @Column(name = "MODULE_NAME") + @ApiParam("模块名称") + private String moduleName; + + @Column(name = "FILE_ID") + @ApiParam("文件id") + private Long fileId; + + @Transient + @ApiParam("文件URL") + private String fileUrl; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java new file mode 100644 index 0000000..39bbd60 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author wangjie + * @version 1.0 + * @date 2021/1/15 15:32 + **/ +@Data +@ApiModel("模块EXCEL管理") +public class AndonConfigModel implements Serializable { + + private static final long serialVersionUID = -3904799282814930138L; + + @ApiParam("id") + private String idStr; + + @ApiParam("id") + private Long id; + + @ApiParam(value ="名称") + private String name; + + @ApiParam(value ="参数代码") + private String configCode; + + @ApiParam(value ="参数描述") + private String configDescription; + + @ApiParam(value ="参数键") + private String configKey; + + @ApiParam(value ="参数键描述") + private String configKeyName; + + @ApiParam(value ="参数值类型") + private String configValueType; + + @ApiParam(value ="参数值类型描述") + private String configValueTypeName; + + @ApiParam(value ="参数值") + private String configValue; + + @ApiParam(value ="参数值描述") + private String configValueDesc; + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("创建用户") + private String createUser; + + @ApiParam("创建日期") + private String createDatetime; + + @ApiParam("修改人") + private String modifyUser; + + @ApiParam("修改日期") + private String modifyDatetime; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonModuleExcelManageModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonModuleExcelManageModel.java new file mode 100644 index 0000000..7bf091d --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonModuleExcelManageModel.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author wangjie + * @version 1.0 + * @date 2021/1/15 15:32 + **/ +@Data +@ApiModel("模块EXCEL管理") +public class AndonModuleExcelManageModel implements Serializable { + + private static final long serialVersionUID = 5632288300819137538L; + + @ApiParam("id") + private String idStr; + + @ApiParam("id") + private Long id; + + @ApiParam("模块代码") + private String moduleCode; + + @ApiParam("模块名称") + private String moduleName; + + @ApiParam("文件ID") + private Long fileId; + + @ApiParam("文件URL") + private String fileUrl; + + @ApiParam("文件原名") + private String fileOriginName; + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("创建用户") + private String createUser; + + @ApiParam("创建日期") + private String createDatetime; + + @ApiParam("修改人") + private String modifyUser; + + @ApiParam("修改日期") + private String modifyDatetime; + + public AndonModuleExcelManageModel() { + } + + public AndonModuleExcelManageModel(Long id, String moduleCode, String moduleName, Long fileId, String fileUrl, String fileOriginName, + String organizeCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + this.id = id; + this.moduleCode = moduleCode; + this.moduleName = moduleName; + this.fileId = fileId; + this.fileUrl = fileUrl; + this.fileOriginName = fileOriginName; + this.organizeCode = organizeCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonFileRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonFileRepository.java new file mode 100644 index 0000000..6042562 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonFileRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonFile; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface IAndonFileRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonModuleExcelManageRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonModuleExcelManageRepository.java new file mode 100644 index 0000000..1cfc299 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonModuleExcelManageRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonModuleExcelManage; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @author wangjie + * @version 1.0 + * @date 2021/1/29 15:02 + **/ +@Repository +public interface IAndonModuleExcelManageRepository 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 9162515..a898563 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 @@ -16,6 +16,13 @@ import org.springframework.util.StringUtils; **/ public class AndonHqlPack { + public static DdlPackBean getAllBaseData(String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); + return packBean; + } + /** * 安灯通知方式查询封装 * @param andonCellGroupCfg @@ -1128,4 +1135,13 @@ public class AndonHqlPack { DdlPreparedPack.getStringLikerPack(record.getAndonOrderNo(), "andonOrderNo", packBean); return packBean; } + + public static DdlPackBean getConfig(AndonConfig config) { + DdlPackBean packBean = getAllBaseDataByNormalPro(config, config.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(config.getConfigCode(), "configCode", packBean); + DdlPreparedPack.getStringLikerPack(config.getName(), "name", packBean); + DdlPreparedPack.getStringEqualPack(config.getConfigKey(), "configKey", packBean); + DdlPreparedPack.getStringEqualPack(config.getConfigValueType(), "configValueType", packBean); + return packBean; + } } From 7fb54f758b77fce0c648e55d5bb7d9b1aae2eb79 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 13 May 2022 12:15:05 +0800 Subject: [PATCH 23/49] andon --- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java | 2 -- .../{AndonStatusInterfaceCfgModel.java => AndonCommEnumModel.java} | 4 ++-- .../java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java | 6 ++++++ .../java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) rename modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/{AndonStatusInterfaceCfgModel.java => AndonCommEnumModel.java} (79%) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java index 9a27fa0..fd777b6 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java @@ -70,12 +70,10 @@ public class AndonConfig extends BaseBean implements Serializable { @ApiParam(value ="参数值描述") private String configValueDesc; - //******以下不用了******* @Column(name="CONFIG_TYPE") @ApiParam(value ="参数类型ID（枚举：1.系统配置...）" , example ="-1") private Integer configType; - // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP @Column(name="CONFIG_GROUP") @ApiParam(value ="参数组") private Integer configGroup; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonStatusInterfaceCfgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonCommEnumModel.java similarity index 79% rename from modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonStatusInterfaceCfgModel.java rename to modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonCommEnumModel.java index 18fd5bb..3770b58 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonStatusInterfaceCfgModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonCommEnumModel.java @@ -12,8 +12,8 @@ import java.io.Serializable; * @desc */ @Data -@ApiModel("安灯事件界面配置MODEL") -public class AndonStatusInterfaceCfgModel implements Serializable { +@ApiModel("安灯枚举配置MODEL") +public class AndonCommEnumModel implements Serializable { private static final long serialVersionUID = -4504617079257753276L; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java index 39bbd60..dcc689e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java @@ -50,6 +50,12 @@ public class AndonConfigModel implements Serializable { @ApiParam(value ="参数值描述") private String configValueDesc; + @ApiParam(value ="参数类型") + private Integer configType; + + @ApiParam(value ="参数组") + private Integer configGroup; + @ApiParam("组织代码") private String organizeCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java index 5035598..7039da7 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java @@ -59,10 +59,10 @@ public abstract class StationRequestBeanAb implements Serializable { @ApiParam(value = "安灯队列编号") public String andonOrderNo; - @ApiParam(value = "安灯事件") + @ApiParam(value = "安灯状态") public String alarmStatus; - @ApiParam(value = "安灯事件名称(呼叫 响应 解决 撤销 等)") + @ApiParam(value = "安灯状态名称(呼叫 响应 解决 撤销 等)") public String alarmStatusName; @ApiParam("消息数据") From 84d8fd30d2a73e92e9732d80846e58eea719f76c Mon Sep 17 00:00:00 2001 From: Ye-Bu <2973583761@qq.com> Date: Fri, 13 May 2022 21:31:31 +0800 Subject: [PATCH 24/49] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=89=E7=81=AF?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=BB=93=E6=9E=84=E8=A1=A8=EF=BC=88=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E3=80=81=E4=BA=A7=E7=BA=BF=E3=80=81=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/andon/bean/AndonArea.java | 44 +++++++++ .../i3plus/pojo/andon/bean/AndonWorkCell.java | 51 ++++++++++ .../i3plus/pojo/andon/bean/AndonWorkCenter.java | 47 ++++++++++ .../i3plus/pojo/andon/model/AndonAreaModel.java | 53 +++++++++++ .../pojo/andon/model/AndonWorkCellModel.java | 53 +++++++++++ .../pojo/andon/model/AndonWorkCenterModel.java | 61 ++++++++++++ .../andon/repository/IAndonAreaRepository.java | 16 ++++ .../andon/repository/IAndonWorkCellRepository.java | 16 ++++ .../repository/IAndonWorkCenterRepository.java | 16 ++++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 104 +++++++++++++++++++++ 10 files changed, 461 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonArea.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCell.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonAreaModel.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCellModel.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCenterModel.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAreaRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonWorkCellRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonWorkCenterRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonArea.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonArea.java new file mode 100644 index 0000000..5ac57e8 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonArea.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.andon.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * @Description :安灯区域 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name="ANDON_AREA") +@Api("安灯区域") +public class AndonArea extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3435045294077955581L; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name="AREA_NAME") + @ApiParam("区域名称") + private String areaName; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCell.java new file mode 100644 index 0000000..a65ca72 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCell.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * @Description :安灯工作单元 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "ANDON_WORK_CELL") +@Api("安灯工作单元") +public class AndonWorkCell extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6782295209026659848L; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam("工作单元名称") + private String workCellName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java new file mode 100644 index 0000000..cdfc419 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * @Description :安灯工作中心 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "ANDON_WORK_CENTER") +@Api("安灯工作中心") +public class AndonWorkCenter extends BaseBean implements Serializable { + + private static final long serialVersionUID = -34850085202020333L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonAreaModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonAreaModel.java new file mode 100644 index 0000000..16cf893 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonAreaModel.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.andon.model; + + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * @Description :安灯区域 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("安灯区域model") +public class AndonAreaModel extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1406838542079597374L; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name="AREA_NAME") + @ApiParam("区域名称") + private String areaName; + + @Transient + @ApiParam(value ="子集列表") + @AnnoOutputColumn(hidden = true) + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + @AnnoOutputColumn(hidden = true) + private String name; + + public String getName(){ + return areaName; + } +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCellModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCellModel.java new file mode 100644 index 0000000..faea63f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCellModel.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description :安灯工作单元 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("安灯工作单元model") +public class AndonWorkCellModel extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4513957019405532048L; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam("工作单元名称") + private String workCellName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; + + @Transient + @ApiParam(value ="名称") + @AnnoOutputColumn(hidden = true) + private String name; + + public String getName(){ + return this.workCellCode; + } +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCenterModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCenterModel.java new file mode 100644 index 0000000..1493686 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCenterModel.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import cn.estsh.i3plus.pojo.andon.bean.AndonWorkCell; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * @Description :安灯工作中心 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("安灯工作中心model") +public class AndonWorkCenterModel extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2737182509323706933L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; + + @Transient + @ApiParam(value ="子集列表") + @AnnoOutputColumn(hidden = true) + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + @AnnoOutputColumn(hidden = true) + private String name; + + public String getName(){ + return this.workCenterName; + } + + public AndonWorkCenterModel(String organizeCode) { + this.organizeCode = organizeCode; + } + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAreaRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAreaRepository.java new file mode 100644 index 0000000..a8c1d95 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAreaRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonArea; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface IAndonAreaRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonWorkCellRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonWorkCellRepository.java new file mode 100644 index 0000000..00a8a5f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonWorkCellRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonWorkCell; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface IAndonWorkCellRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonWorkCenterRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonWorkCenterRepository.java new file mode 100644 index 0000000..d35e8fa --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonWorkCenterRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonWorkCenter; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface IAndonWorkCenterRepository 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 a898563..86135c1 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 @@ -523,6 +523,19 @@ public class AndonHqlPack { } /** + * 安灯区域信息查询条件封装 + * @param andonArea + * @return + */ + public static DdlPackBean getAndonArea(AndonArea andonArea, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(andonArea, organizeCode); + DdlPreparedPack.getStringEqualPack(andonArea.getAreaCode(), "areaCode", packBean); + packBean.setOrderByStr(andonArea.orderBy()); + + return packBean; + } + + /** * MES工作中心信息查询条件封装 * @param mesWorkCenter * @return @@ -538,6 +551,21 @@ public class AndonHqlPack { } /** + * Andon工作中心信息查询条件封装 + * @param andonWorkCenter + * @return + */ + public static DdlPackBean getAndonWorkCenter(AndonWorkCenter andonWorkCenter, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(andonWorkCenter, organizeCode); + + DdlPreparedPack.getStringEqualPack(andonWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(andonWorkCenter.getAreaCode(), "areaCode", packBean); + packBean.setOrderByStr(andonWorkCenter.orderBy()); + + return packBean; + } + + /** * MES工作单元信息查询条件封装 * @param mesWorkCell * @return @@ -555,6 +583,23 @@ public class AndonHqlPack { } /** + * andon工作单元信息查询条件封装 + * @param andonWorkCell + * @return + */ + public static DdlPackBean getAndonWorkCell(AndonWorkCell andonWorkCell, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(andonWorkCell, organizeCode); + + DdlPreparedPack.getStringEqualPack(andonWorkCell.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(andonWorkCell.getAreaCode(), "areaCode", packBean); + DdlPreparedPack.getStringEqualPack(andonWorkCell.getWorkCellCode(), "workCellCode", packBean); + + packBean.setOrderByStr(andonWorkCell.orderBy()); + + return packBean; + } + + /** * MES设备信息查询条件封装 * @param mesEquipment * @return @@ -809,6 +854,25 @@ public class AndonHqlPack { } /** + * 安灯区域唯一校验 + * @param andonArea + * @return + */ + public static DdlPackBean packHqlCheckAndonAreaOnlyByAreaCode(AndonArea andonArea){ + DdlPackBean result = new DdlPackBean(); + if (andonArea != null && andonArea.getId() != null && andonArea.getId().longValue() > 0) { + DdlPreparedPack.getNumNOEqualPack(andonArea.getId(),"id",result); + } + + if (andonArea != null) { + DdlPreparedPack.getStringEqualPack(andonArea.getAreaCode(), "areaCode", result); + } + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + + return result; + } + + /** * 工作中心唯一校验 * @param mesWorkCenter * @return @@ -828,6 +892,25 @@ public class AndonHqlPack { } /** + * 安灯工作中心唯一校验 + * @param andonWorkCenter + * @return + */ + public static DdlPackBean packHqlCheckAndonWorkCenterOnlyByWorkCenterCode(AndonWorkCenter andonWorkCenter){ + DdlPackBean result = new DdlPackBean(); + if (andonWorkCenter != null && andonWorkCenter.getId() != null && andonWorkCenter.getId().longValue() > 0) { + DdlPreparedPack.getNumNOEqualPack(andonWorkCenter.getId(),"id",result); + } + + if (andonWorkCenter != null) { + DdlPreparedPack.getStringEqualPack(andonWorkCenter.getWorkCenterCode(), "workCenterCode", result); + } + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + + return result; + } + + /** * 工作单元唯一校验 * @param mesWorkCell * @return @@ -847,6 +930,25 @@ public class AndonHqlPack { } /** + * 工作单元唯一校验 + * @param andonWorkCell + * @return + */ + public static DdlPackBean packHqlCheckAndonWorkCellOnlyByWorkCellCode(AndonWorkCell andonWorkCell){ + DdlPackBean result = new DdlPackBean(); + if (andonWorkCell != null && andonWorkCell.getId() != null && andonWorkCell.getId().longValue() > 0) { + DdlPreparedPack.getNumNOEqualPack(andonWorkCell.getId(),"id",result); + } + + if (andonWorkCell != null) { + DdlPreparedPack.getStringEqualPack(andonWorkCell.getWorkCellCode(), "workCellCode", result); + } + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + + return result; + } + + /** * 设备唯一校验 * @param mesEquipment * @return @@ -1144,4 +1246,6 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(config.getConfigValueType(), "configValueType", packBean); return packBean; } + + } From d1080017398a9fff72f85473ed8fd32578d4e7ae Mon Sep 17 00:00:00 2001 From: Ye-Bu <2973583761@qq.com> Date: Fri, 13 May 2022 21:50:03 +0800 Subject: [PATCH 25/49] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E3=80=81=E4=BA=A7=E7=BA=BF=E3=80=81=E5=B7=A5=E4=BD=8Dmodel?= =?UTF-8?q?=E4=B8=AD=E5=8E=BB=E9=99=A4@column?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/model/AndonAreaModel.java | 2 -- .../java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCellModel.java | 4 ---- .../java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCenterModel.java | 3 --- 3 files changed, 9 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonAreaModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonAreaModel.java index 16cf893..81e924f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonAreaModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonAreaModel.java @@ -29,11 +29,9 @@ public class AndonAreaModel extends BaseBean implements Serializable { private static final long serialVersionUID = 1406838542079597374L; - @Column(name="AREA_CODE") @ApiParam("区域代码") private String areaCode; - @Column(name="AREA_NAME") @ApiParam("区域名称") private String areaName; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCellModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCellModel.java index faea63f..b9efdb0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCellModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCellModel.java @@ -26,19 +26,15 @@ public class AndonWorkCellModel extends BaseBean implements Serializable { private static final long serialVersionUID = -4513957019405532048L; - @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; - @Column(name = "WORK_CELL_NAME") @ApiParam("工作单元名称") private String workCellName; - @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; - @Column(name = "AREA_CODE") @ApiParam("生产区域代码") private String areaCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCenterModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCenterModel.java index 1493686..658cf17 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCenterModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCenterModel.java @@ -28,15 +28,12 @@ public class AndonWorkCenterModel extends BaseBean implements Serializable { private static final long serialVersionUID = -2737182509323706933L; - @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name = "WORK_CENTER_NAME") @ApiParam("工作中心名称") private String workCenterName; - @Column(name = "AREA_CODE") @ApiParam("生产区域代码") private String areaCode; From 83be0e6f9124b0adfb5ad7c5877ca244e6f543ed Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 15 May 2022 14:13:23 +0800 Subject: [PATCH 26/49] andon --- .../java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java | 2 +- .../java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java index ac70dd0..4303c7c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java @@ -21,7 +21,7 @@ public class StationRequestBean extends StationRequestBeanAb implements Serializ public String toString() { return "StationRequestBean{" + "actorReceiveStrategyClass='" + get(actorReceiveStrategyClass) + '\'' + - ", stationRequestBeanAbClass='" + get(stationRequestBeanAbClass) + '\'' + + ", actorClass='" + get(actorClass) + '\'' + ", fsmCachedKey='" + get(fsmCachedKey) + '\'' + ", organizeCode='" + get(organizeCode) + '\'' + ", userInfo='" + get(userInfo) + '\'' + diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java index 7039da7..e3797ef 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java @@ -23,8 +23,8 @@ public abstract class StationRequestBeanAb implements Serializable { @ApiParam("ACTOR接收策略类名") public String actorReceiveStrategyClass; - @ApiParam("工位请求bean子类") - public String stationRequestBeanAbClass; + @ApiParam("ACTOR类名") + public String actorClass; @ApiParam("缓存数据KEY") public String fsmCachedKey; From 772dcac79f1660e9526e42ce62f66d8e99c89383 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 16 May 2022 21:05:23 +0800 Subject: [PATCH 27/49] andon --- .../estsh/i3plus/pojo/andon/bean/AndonActionModule.java | 11 +++++------ .../i3plus/pojo/andon/bean/AndonActionModuleGroup.java | 11 +++++------ .../i3plus/pojo/andon/bean/AndonActionModuleParam.java | 12 ++++++------ .../cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java | 12 +++++------- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java | 11 +++++------ .../cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java | 11 +++++------ .../i3plus/pojo/andon/bean/AndonAlarmDetailType.java | 13 +++++++------ .../cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java | 15 ++++++++------- .../pojo/andon/bean/AndonAlarmRouteModuleParam.java | 12 ++++++------ .../cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java | 12 +++++------- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonArea.java | 7 ++++--- .../estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java | 11 +++++------ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java | 12 ++++++------ .../cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java | 11 +++++------ .../i3plus/pojo/andon/bean/AndonRouteModuleParam.java | 11 +++++------ .../cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java | 11 ++++------- .../cn/estsh/i3plus/pojo/andon/bean/AndonWorkCell.java | 9 ++++++--- .../cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java | 10 ++++++---- .../cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 13 +++++++++++++ 19 files changed, 111 insertions(+), 104 deletions(-) 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 7fe53f7..480064b 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 @@ -4,16 +4,12 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.data.annotation.Transient; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -25,7 +21,10 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ACTION_MODULE") +@Table(name = "ANDON_ACTION_MODULE", indexes = { + @Index(columnList = "AM_CODE"), + @Index(columnList = "AM_NAME") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("作业组件") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java index a203e27..e550639 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java @@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +22,10 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ACTION_MODULE_GROUP") +@Table(name = "ANDON_ACTION_MODULE_GROUP", indexes = { + @Index(columnList = "AMG_ID"), + @Index(columnList = "AM_CODE") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("组件集") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java index 1f38770..7739928 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java @@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +22,11 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ACTION_MODULE_PARAM") +@Table(name = "ANDON_ACTION_MODULE_PARAM", indexes = { + @Index(columnList = "AM_CODE"), + @Index(columnList = "PARAM_CODE"), + @Index(columnList = "AM_CODE, PARAM_CODE") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("组件参数") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java index 85e0253..c8730c9 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java @@ -4,16 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +21,10 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ACTION_ROUTE") +@Table(name = "ANDON_ACTION_ROUTE", indexes = { + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "ROUTE_NAME") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("作业流程") 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 242b401..4264c2b 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 @@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +22,10 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ACTOR") +@Table(name = "ANDON_ACTOR", indexes = { + @Index(columnList = "ACTOR_CODE"), + @Index(columnList = "ACTOR_NAME") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("ACTOR信息") 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 9001d81..a12b327 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 @@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +22,10 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ACTOR_RULE") +@Table(name = "ANDON_ACTOR_RULE", indexes = { + @Index(columnList = "ACTOR_CODE"), + @Index(columnList = "MT_CODE") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("ACTOR消息类型配置") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java index 1dd3267..9ef65fb 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java @@ -6,15 +6,11 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +22,12 @@ import java.io.Serializable; **/ @Data @Entity -@Table(name="ANDON_ALARM_DETAIL_TYPE") +@Table(name = "ANDON_ALARM_DETAIL_TYPE", indexes = { + @Index(columnList = "ALARM_CODE"), + @Index(columnList = "ALARM_DETAIL_CODE"), + @Index(columnList = "ALARM_DETAIL_NAME"), + @Index(columnList = "ALARM_CODE, ALARM_DETAIL_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java index 3b1b0c8..6135b57 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java @@ -4,16 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +21,13 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ALARM_ROUTE") +@Table(name = "ANDON_ALARM_ROUTE", indexes = { + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "ALARM_CODE"), + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "ROUTE_CODE, ALARM_CODE"), + @Index(columnList = "ROUTE_CODE, ALARM_CODE, WORK_CENTER_CODE") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("安灯作业流程配置") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java index 15163b4..3537dfb 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java @@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +22,11 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ALARM_ROUTE_MODULE_PARAM") +@Table(name = "ANDON_ALARM_ROUTE_MODULE_PARAM", indexes = { + @Index(columnList = "ALARM_ROUTE_ID"), + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "ALARM_ROUTE_ID, ROUTE_CODE") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("安灯作业流程组件参数") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java index 4d777cc..98f8e1e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java @@ -4,16 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +21,10 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ALARM_TYPE") +@Table(name = "ANDON_ALARM_TYPE", indexes = { + @Index(columnList = "ALARM_CODE"), + @Index(columnList = "ALARM_NAME") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("安灯类型") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonArea.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonArea.java index 5ac57e8..c7bbf8d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonArea.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonArea.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.andon.bean; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -12,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; -import java.util.List; /** * @Description :安灯区域 @@ -27,7 +25,10 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name="ANDON_AREA") +@Table(name = "ANDON_AREA", indexes = { + @Index(columnList = "AREA_CODE"), + @Index(columnList = "AREA_NAME") +}) @Api("安灯区域") public class AndonArea extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java index ee0d921..02cb2c5 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java @@ -4,15 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -25,7 +21,10 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_AREA_ALARM_TYPE") +@Table(name = "ANDON_AREA_ALARM_TYPE", indexes = { + @Index(columnList = "AREA_CODE"), + @Index(columnList = "ALARM_CODE") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("区域安灯类型") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java index fd777b6..f6bdeaa 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java @@ -4,15 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -28,7 +24,11 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name="ANDON_CONFIG") +@Table(name = "ANDON_CONFIG", indexes = { + @Index(columnList = "CONFIG_CODE"), + @Index(columnList = "CONFIG_CODE, CONFIG_KEY"), + @Index(columnList = "CONFIG_CODE, CONFIG_KEY, CONFIG_GROUP") +}) @Api(value="系统配置") public class AndonConfig extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java index cac7d25..caee751 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java @@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +22,10 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_MESSAGE_TYPE") +@Table(name = "ANDON_MESSAGE_TYPE", indexes = { + @Index(columnList = "MT_CODE"), + @Index(columnList = "MT_NAME") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("消息类型") 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 ae11cf7..1bf913e 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 @@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +22,10 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ROUTE_MODULE_PARAM") +@Table(name = "ANDON_ROUTE_MODULE_PARAM", indexes = { + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "ROUTE_CODE, AMG_ID, AM_CODE, STATUS_CODE") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("流程组件参数") 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 6713197..9d3f63c 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 @@ -5,16 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -27,7 +22,9 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ROUTE_STATUS") +@Table(name = "ANDON_ROUTE_STATUS", indexes = { + @Index(columnList = "ROUTE_CODE") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("流程状态") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCell.java index a65ca72..18935de 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCell.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCell.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.andon.bean; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -11,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; -import java.util.List; /** * @Description :安灯工作单元 @@ -26,7 +24,12 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "ANDON_WORK_CELL") +@Table(name = "ANDON_WORK_CELL", indexes = { + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WORK_CELL_CODE"), + @Index(columnList = "WORK_CELL_NAME"), + @Index(columnList = "WORK_CENTER_CODE, WORK_CELL_CODE") +}) @Api("安灯工作单元") public class AndonWorkCell extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java index cdfc419..e92ddbf 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.andon.bean; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -11,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; -import java.util.List; /** * @Description :安灯工作中心 @@ -26,7 +24,12 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "ANDON_WORK_CENTER") +@Table(name = "ANDON_WORK_CENTER", indexes = { + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WORK_CENTER_NAME"), + @Index(columnList = "AREA_CODE"), + @Index(columnList = "AREA_CODE, WORK_CENTER_CODE") +}) @Api("安灯工作中心") public class AndonWorkCenter extends BaseBean implements Serializable { @@ -40,7 +43,6 @@ public class AndonWorkCenter extends BaseBean implements Serializable { @ApiParam("工作中心名称") private String workCenterName; - @Column(name = "AREA_CODE") @ApiParam("生产区域代码") private String areaCode; 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 86135c1..9c713e1 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 @@ -1247,5 +1247,18 @@ public class AndonHqlPack { return packBean; } + /** + * Andon工作中心信息查询条件封装 + * @param workCenter + * @return + */ + public static DdlPackBean getAllCenter(AndonWorkCenter workCenter) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(workCenter.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(workCenter.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringLikerPack(workCenter.getWorkCenterName(), "workCenterName", packBean); + DdlPreparedPack.getStringEqualPack(workCenter.getAreaCode(), "areaCode", packBean); + return packBean; + } + } From 55cc12c01a6039783d770616470e9cb90d49744d Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 18 May 2022 09:38:21 +0800 Subject: [PATCH 28/49] =?UTF-8?q?=E6=96=B0=E5=A2=9Eandon=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?core=E7=9A=84model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/platform/AndonQueryUserModel.java | 27 ++++++++++++++++++++ .../model/platform/AndonQueryUserResultModel.java | 29 ++++++++++++++++++++++ .../model/platform/DingSendBatchRequestModel.java | 4 ++- 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserResultModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java new file mode 100644 index 0000000..2d6bf63 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author ns + * @create 2022/5/17 0017 下午 15:38 + * andon 查询用户信息model + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("andon 调用core查询的model") +public class AndonQueryUserModel { + @ApiModelProperty(value ="工厂代码" , access ="工厂代码") + private String organizeCode; + @ApiModelProperty(value ="账号登录名" , access ="账号登录名") + private String userLoginName; + @ApiModelProperty(value ="用户名称" , access ="用户名称") + private String userName; + @ApiModelProperty(value ="部门名称" , access ="部门名称") + private String department; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserResultModel.java new file mode 100644 index 0000000..62405be --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserResultModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author ns + * @create 2022/5/17 0017 下午 15:39 + * 松下andon 查询结果返回model + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("根据条件查询数据返回给andon的结果") +public class AndonQueryUserResultModel { + @ApiModelProperty(value ="用户账号id" , access ="用户账号id") + private Long userId; + @ApiModelProperty(value ="用户信息id" , access ="用户信息id") + private Long userInfoId; + @ApiModelProperty(value ="账号登录名" , access ="账号登录名") + private String loginName; + @ApiModelProperty(value ="用户名称" , access ="用户名称") + private String userName; + @ApiModelProperty(value ="部门名称" , access ="部门名称") + private String department; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java index 0f1cf1a..55de6ed 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java @@ -19,7 +19,9 @@ import java.util.List; public class DingSendBatchRequestModel { @ApiModelProperty(value ="手机号" , access ="手机号") - private List phoneNumberList ; + private List phoneNumberList; + @ApiModelProperty(value ="账号登录名列表" , access ="账号登录名列表") + private List userLoginNameList ; @ApiModelProperty(value ="消息标题" , access ="消息标题") private String title ; @ApiModelProperty(value ="消息内容" , access ="消息内容") From 6e47adcdd2a6172183628fca499ba70c1103e445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=8B=E9=B8=BF=E8=BE=89?= <2579728558@qq.com> Date: Wed, 18 May 2022 17:48:27 +0800 Subject: [PATCH 29/49] =?UTF-8?q?MesQueueOrderDetai=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 379048c..bfcda35 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -147,6 +147,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("回冲标识") private String jisBackflushStatus; + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private String qcStatus; + @Transient @ApiParam("Vin") private String vinCode; From 05331ea5de973ce97755a7150cf19781c35aef91 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 19 May 2022 20:18:58 +0800 Subject: [PATCH 30/49] =?UTF-8?q?=E5=AE=89=E7=81=AF=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/andon/model/FsmModel.java | 3 -- .../i3plus/pojo/andon/model/ModuleResult.java | 63 ++++++++++++++++++++++ 2 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java index 1c5d24a..6197372 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java @@ -69,7 +69,4 @@ public class FsmModel implements Serializable { @ApiParam("进入触发方法时默认不需要校验外部触发") private boolean checkTriggerTypeFalg = false; - @ApiParam("下个触发事件") - private String nextTriggerEvent; - } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java new file mode 100644 index 0000000..bc8c717 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.andon.model; + + +import io.swagger.annotations.Api; +import lombok.Data; + +@Data +@Api("组件返回信息") +public class ModuleResult { + + private boolean isCompleted; + + private String msg; + + private String nextTriggerEvent; + + public static ModuleResult getNonComplete() { + return new ModuleResult(false, ""); + } + + public static ModuleResult getNonComplete(String msg) { + return new ModuleResult(false, msg); + } + + public static ModuleResult getCustomNonComplete(String nextTriggerEvent) { + return new ModuleResult(false, "", nextTriggerEvent); + } + + public static ModuleResult getCustomNonComplete(String msg, String nextTriggerEvent) { + return new ModuleResult(false, msg, nextTriggerEvent); + } + + public static ModuleResult getSuccessComplete() { + return new ModuleResult(true, ""); + } + + public static ModuleResult getSuccessComplete(String msg) { + return new ModuleResult(true, msg); + } + + public static ModuleResult getCustomSuccessComplete(String nextTriggerEvent) { + return new ModuleResult(true, "", nextTriggerEvent); + } + + public static ModuleResult getCustomSuccessComplete(String msg, String nextTriggerEvent) { + return new ModuleResult(true, msg, nextTriggerEvent); + } + + private ModuleResult() { + } + + private ModuleResult(boolean isCompleted, String msg) { + this.isCompleted = isCompleted; + this.msg = msg; + } + + public ModuleResult(boolean isCompleted, String msg, String nextTriggerEvent) { + this.isCompleted = isCompleted; + this.msg = msg; + this.nextTriggerEvent = nextTriggerEvent; + } + +} From 463e863ea4ebac3936e0202f8ba9e430f0eedc6a Mon Sep 17 00:00:00 2001 From: Ye-Bu <2973583761@qq.com> Date: Fri, 20 May 2022 12:03:54 +0800 Subject: [PATCH 31/49] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E3=80=81=E5=B7=A5=E4=BD=8D=E4=B8=8B=E6=8B=89=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonWorkCenter.java | 9 +++++-- .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 29 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java index cdfc419..b80bc49 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.andon.bean; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -11,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; -import java.util.List; /** * @Description :安灯工作中心 @@ -44,4 +42,11 @@ public class AndonWorkCenter extends BaseBean implements Serializable { @Column(name = "AREA_CODE") @ApiParam("生产区域代码") private String areaCode; + + public AndonWorkCenter(String organizeCode) { + this.organizeCode = organizeCode; + } + + public AndonWorkCenter() { + } } 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 86135c1..ade9b26 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 @@ -264,6 +264,20 @@ public class AndonHqlPack { } /** + * 按条件查询安灯工作中心 + * @param andonWorkCenter + * @return + */ + public static DdlPackBean packHqlAndonWorkCenter(AndonWorkCenter andonWorkCenter){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonWorkCenter.getWorkCenterCode(), "workCenterCode", result); + getStringBuilderPack(andonWorkCenter, result); + + return result; + } + + /** * 按条件查询工作单元（工位） * @param mesWorkCell * @return @@ -279,6 +293,21 @@ public class AndonHqlPack { } /** + * 按条件查询工作单元（工位） + * @param andonWorkCell + * @return + */ + public static DdlPackBean packHqlAndonWorkCell(AndonWorkCell andonWorkCell){ + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonWorkCell.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getStringEqualPack(andonWorkCell.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(andonWorkCell.getWorkCellCode(), "workCellCode", result); + getStringBuilderPack(andonWorkCell, result); + + return result; + } + + /** * 按条件查询设备 * @param mesEquipment * @return From f601fe7594ba3cefade2a574e1661e41aa865398 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 20 May 2022 17:07:53 +0800 Subject: [PATCH 32/49] andon --- .../java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java index bc8c717..b05f139 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java @@ -10,6 +10,8 @@ public class ModuleResult { private boolean isCompleted; + private boolean isError = false; + private String msg; private String nextTriggerEvent; @@ -30,6 +32,10 @@ public class ModuleResult { return new ModuleResult(false, msg, nextTriggerEvent); } + public static ModuleResult getErrorComplete(String msg) { + return new ModuleResult(false, true, msg); + } + public static ModuleResult getSuccessComplete() { return new ModuleResult(true, ""); } @@ -54,6 +60,12 @@ public class ModuleResult { this.msg = msg; } + private ModuleResult(boolean isCompleted, boolean isError, String msg) { + this.isCompleted = isCompleted; + this.isError = isError; + this.msg = msg; + } + public ModuleResult(boolean isCompleted, String msg, String nextTriggerEvent) { this.isCompleted = isCompleted; this.msg = msg; From d47f146eaa96d81a094ac6edc40fe5d674a96f08 Mon Sep 17 00:00:00 2001 From: Ye-Bu <2973583761@qq.com> Date: Sun, 22 May 2022 13:07:12 +0800 Subject: [PATCH 33/49] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E3=80=81=E5=B7=A5=E4=BD=8D=E5=BC=80=E7=AA=97=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=B0=81=E8=A3=85packBean?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) 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 221dd24..f9d5777 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 @@ -1289,5 +1289,29 @@ public class AndonHqlPack { return packBean; } + /** + * Andon工作单元信息查询条件封装 + * @param workCell + * @return + */ + public static DdlPackBean getAllCell(AndonWorkCell workCell) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(workCell.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(workCell.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringLikerPack(workCell.getWorkCellName(), "workCellName", packBean); + DdlPreparedPack.getStringEqualPack(workCell.getWorkCenterCode(), "workCenterCode", packBean); + return packBean; + } + + /** + * Andon 区域信息查询条件封装 + * @param area + * @return + */ + public static DdlPackBean getAllArea(AndonArea area) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(area.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(area.getAreaCode(), "areaCode", packBean); + DdlPreparedPack.getStringLikerPack(area.getAreaName(), "areaName", packBean); + return packBean; + } } From bff90c422c6472444f91e0adc26e32f7299fa07e Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 25 May 2022 13:58:18 +0800 Subject: [PATCH 34/49] =?UTF-8?q?blocksoftswitch=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E7=9B=B8=E5=85=B3pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 46 +++++++++++++ .../pojo/softswitch/bean/BsSuitCaseWebService.java | 25 +++++++ .../pojo/softswitch/bean/ScriptPersistence.java | 76 ++++++++++++++++++++++ .../repository/ScriptPersistenceRepository.java | 13 ++++ 4 files changed, 160 insertions(+) create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/ScriptPersistence.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/ScriptPersistenceRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index d086299..6e91f92 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -1290,4 +1290,50 @@ public class BlockSoftSwitchEnumUtil { } } + + /** + * 脚本语言类型 + * 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby + */ + public enum LANGUAGE_TYPE { + GROOVY(1, "Groovy", 10), + PYTHON(2, "jython", 20), // "jython" string can not change + JS(3, "JavaScript", 30); + // 下面这2种语言没人会写，暂不支持 + //SCALA(40,"scala"), + //JRUBY(50,"jruby"); + + private int index; + private String description; + private int value; + + LANGUAGE_TYPE(int index, String description, int value) { + this.index = index; + this.description = description; + this.value = value; + } + + public String getDescription() { + return description; + } + + public int getIndex() { + return this.index; + } + + public int getValue() { + return value; + } + + // 根据枚举编号获取语言代码 + public static String getCodeByIndex(Integer index) { + for (WmsEnumUtil.LANGUAGE_TYPE languageType : WmsEnumUtil.LANGUAGE_TYPE.values()) { + if (languageType.getValue() == index) { + return languageType.getDescription(); + } + } + + return null; + } + } } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java index 0ddb778..ccd749f 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.softswitch.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -47,4 +48,28 @@ public class BsSuitCaseWebService extends BaseBean { @Column(name = "CALL_RESTFUL_URL") @ApiParam(value = "CALL RESTFUL URL(调用restful接口的地址)") private String callRestfulUrl; + + @Column(name = "CONNECTION_TIMEOUT") + @ApiParam(value = "connectionTimeout 连接超时时间") + private Long connectionTimeout; + + @Column(name = "RECEIVE_TIMEOUT") + @ApiParam(value = "ReceiveTimeout 接收数据超时时间") + private Long receiveTimeout; + + + @Column(name = "CONNECTION_REQUEST_TIMEOUT") + @ApiParam(value = "connectionRequestTimeout 请求超时时间") + private Long connectionRequestTimeout; + + + + @Column(name = "CALL_SCRIPT_SWITCH") + @ApiParam(value = "调用脚本的开关 ") + private Integer callScriptSwitch; + + @Column(name = "SCRIPT_NO", length = 50) + @ApiParam(name = "脚本编码") + private String scriptNo; + } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/ScriptPersistence.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/ScriptPersistence.java new file mode 100644 index 0000000..6018d42 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/ScriptPersistence.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * 脚本持久化实体类 + * + */ +@Data +@Entity +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "SCRIPT_PERSISTENCE", uniqueConstraints = { + @UniqueConstraint(columnNames = {"SCRIPT_NO"}) +}) +@Api("动态脚本脚本，目前只支持groovy") +public class ScriptPersistence extends BaseBean { + private static final long serialVersionUID = 7893111140559759490L; + // 脚本调用的唯一编号，例如：WMS_PDA_0001 + @Column(name = "SCRIPT_NO", length = 50) + @AnnoOutputColumn(name = "脚本编码") + private String scriptNo; + + // 脚本的中文名称F + @Column(name = "SCRIPT_NAME", length = 50) + @AnnoOutputColumn(name = "脚本名称") + private String scriptName; + + // 10=webService 结果拦截脚本 + @Column(name = "SCRIPT_TYPE") + @AnnoOutputColumn(name = "脚本类型") + private Integer scriptType; + + // 脚本编写的语言 + // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby + @Column(name = "LANGUAGE_TYPE") + @AnnoOutputColumn(name = "脚本语言") + private Integer languageType; + + // 脚本的具体内容 + @Lob + @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") + @AnnoOutputColumn(name = "脚本内容") + private String scriptContent; + + // 脚本的描述，包含脚本的用法，参数说明等 + @Column(name = "SCRIPT_REMARK", length = 2000) + @AnnoOutputColumn(name = "脚本描述",required = false) + private String scriptRemark; + + // 编译后的脚本内容，通过预编译加快脚本的运行速度 + @Transient + private Object compiledScript; + + // 构造方法，便于批量创建数据 + public ScriptPersistence(Long id, String scriptNo, String scriptName, Integer scriptType, Integer languageType, + String scriptContent, String scriptRemark) { + this.id = id; + this.scriptNo = scriptNo; + this.scriptName = scriptName; + this.scriptType = scriptType; + this.languageType = languageType; + this.scriptContent = scriptContent; + this.scriptRemark = scriptRemark; + } +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/ScriptPersistenceRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/ScriptPersistenceRepository.java new file mode 100644 index 0000000..87adaf0 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/ScriptPersistenceRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.ScriptPersistence; +import org.springframework.stereotype.Repository; + +/** + * @author ns + * @create 2022/5/24 0024 下午 14:11 + */ +@Repository +public interface ScriptPersistenceRepository extends BaseRepository { +} From ad2b876d9740224f18cfd232f66aeb5a299e352f Mon Sep 17 00:00:00 2001 From: nies Date: Fri, 27 May 2022 11:21:13 +0800 Subject: [PATCH 35/49] =?UTF-8?q?=E4=BF=AE=E6=94=B9AndonQueryUserModel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java index 2d6bf63..0f4dc91 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.platform; +import cn.estsh.i3plus.pojo.base.common.Pager; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -24,4 +25,6 @@ public class AndonQueryUserModel { private String userName; @ApiModelProperty(value ="部门名称" , access ="部门名称") private String department; + @ApiModelProperty(value ="分页参数" , access ="分页参数") + private Pager pager; } From 4b0dc458b2dce45142c6d56aaa56fce1edb07056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=8B=E9=B8=BF=E8=BE=89?= <2579728558@qq.com> Date: Fri, 27 May 2022 15:29:11 +0800 Subject: [PATCH 36/49] =?UTF-8?q?MesBypssMapping=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=A7=E5=93=81=E4=BD=8D=E7=BD=AE=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java index b6ae404..ae54a9e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java @@ -45,6 +45,10 @@ public class MesBypassMapping extends BaseBean implements Serializable { @ApiParam("是否显示") private Integer isDisplay; + @Column(name = "PART_LOCATION") + @ApiParam("产品位置") + private String partLocation; + @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") private String prodCfgTypeCode; From a625f052934c46d280cde51b6de31b5fc1f3ccac Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 27 May 2022 17:12:38 +0800 Subject: [PATCH 37/49] andon --- .../andon/model/AndonAlarmDetailTypeModel.java | 50 ++++++++++++++++++++++ .../i3plus/pojo/andon/model/AndonConfigModel.java | 2 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonAlarmDetailTypeModel.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonAlarmDetailTypeModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonAlarmDetailTypeModel.java new file mode 100644 index 0000000..95a575e --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonAlarmDetailTypeModel.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author wangjie + * @version 1.0 + * @date 2021/1/15 15:32 + **/ +@Data +@ApiModel("安灯子类型model") +public class AndonAlarmDetailTypeModel implements Serializable { + + private static final long serialVersionUID = 2877279779029264810L; + + @ApiParam("id") + private Long id; + + @ApiParam(value = "安灯子类型编码") + private String alarmDetailCode; + + @ApiParam(value = "安灯子类型名称") + private String alarmDetailName; + + @ApiParam(value = "安灯类型") + private String alarmCode; + + @ApiParam(value = "安灯类型") + private String alarmName; + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("创建用户") + private String createUser; + + @ApiParam("创建日期") + private String createDatetime; + + @ApiParam("修改人") + private String modifyUser; + + @ApiParam("修改日期") + private String modifyDatetime; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java index dcc689e..9b604da 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java @@ -12,7 +12,7 @@ import java.io.Serializable; * @date 2021/1/15 15:32 **/ @Data -@ApiModel("模块EXCEL管理") +@ApiModel("安灯系统配置model") public class AndonConfigModel implements Serializable { private static final long serialVersionUID = -3904799282814930138L; From 633ffd269f38f2857f25f8bba303b92923a74afe Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 28 May 2022 13:38:01 +0800 Subject: [PATCH 38/49] =?UTF-8?q?=E5=AE=89=E7=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java index 1794089..7672a2b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java @@ -26,6 +26,7 @@ import java.io.Serializable; @Index(columnList = "WORK_CENTER_CODE, WORK_CELL_CODE"), @Index(columnList = "ANDON_ORDER_NO"), @Index(columnList = "MSG_TYPE"), + @Index(columnList = "HANDLE_STATUS"), @Index(columnList = "WORK_CENTER_CODE, WORK_CELL_CODE, ANDON_ORDER_NO"), @Index(columnList = "WORK_CENTER_CODE, WORK_CELL_CODE, HANDLE_STATUS") }) 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 f9d5777..2113e64 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 @@ -1264,6 +1264,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(record.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(record.getWorkCellCode(), "workCellCode", packBean); DdlPreparedPack.getStringLikerPack(record.getAndonOrderNo(), "andonOrderNo", packBean); + DdlPreparedPack.getNumEqualPack(record.getHandleStatus(), "handleStatus", packBean); return packBean; } From 2bded2e4a67c25d4def50a98acaae9a3a060b212 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 30 May 2022 22:14:56 +0800 Subject: [PATCH 39/49] andon --- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java index 6135b57..5f94b60 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java @@ -25,6 +25,7 @@ import java.io.Serializable; @Index(columnList = "ROUTE_CODE"), @Index(columnList = "ALARM_CODE"), @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WORK_CENTER_CODE, ROUTE_TYPE"), @Index(columnList = "ROUTE_CODE, ALARM_CODE"), @Index(columnList = "ROUTE_CODE, ALARM_CODE, WORK_CENTER_CODE") }) From 8244e9f80977bc3f7121caeebac3644c9d5a5c2a Mon Sep 17 00:00:00 2001 From: nies Date: Tue, 31 May 2022 17:26:56 +0800 Subject: [PATCH 40/49] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=B9=E8=B4=A6?= =?UTF-8?q?=E5=8D=95model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/wms/ReconciliaDetailResultModel.java | 57 +++++++++++++++ .../wms/ReconciliaDetailSummaryResultModel.java | 47 ++++++++++++ .../pojo/model/wms/ReconciliaQueryModel.java | 83 ++++++++++++++++++++++ .../pojo/model/wms/ReconciliaResultModel.java | 15 ++++ .../model/wms/ReconciliaSummayResultModel.java | 48 +++++++++++++ 5 files changed, 250 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaResultModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaSummayResultModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java new file mode 100644 index 0000000..c6ef73e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author ns + * @create 2022/5/31 0031 下午 16:52 + */ +@Data +@ApiModel("对账单明细model") +public class ReconciliaDetailResultModel implements Serializable { + @ApiModelProperty(name = "物料编号") + private String partNo; + + + @ApiModelProperty(name = "库存地编号") + private String zoneNo; + + @ApiModelProperty(name = "仓库存储区编号") + private String whNo; + + @ApiModelProperty(name = "业务类型") + private Integer busiTypeCode; + + @ApiModelProperty(name = "IQ状态 正常异常") + private Integer iQStatus; + + @ApiModelProperty(name = "单号") + private String orderNo; + + @ApiModelProperty(name = "单据状态") + public Integer orderStatus; + + @ApiModelProperty(name = "库存移动单号") + private String moveNo; + + @ApiModelProperty(name = "处理数量") + private Double handleQty; + + @ApiModelProperty(name = "移动单状态") + private Integer moveItemStatus; + + @ApiModelProperty(name = "movetoerp状态") + private Integer moveToERPStatus; + + + @ApiModelProperty(name = "中间表状态") + private Integer middleTableStatus; + @ApiModelProperty(name = "oQ状态 正常异常") + private Integer oQStatus; + + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java new file mode 100644 index 0000000..5bbf1f7 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author ns + * @create 2022/5/31 0031 下午 16:52 + */ +@Data +@ApiModel("对账单查询model") +public class ReconciliaDetailSummaryResultModel implements Serializable { + @ApiModelProperty(name = "物料编号") + private String partNo; + + + @ApiModelProperty(name = "库存地编号") + private String zoneNo; + + @ApiModelProperty(name = "来源存储区") + private String srcZoneNo; + + @ApiModelProperty(name = "目标存储区") + private String destZoneNo; + + @ApiModelProperty(name = "业务类型") + private Integer busiTypeCode; + + + @ApiModelProperty(name = "单据状态") + public Integer orderStatus; + + @ApiModelProperty(name = "需求数量") + private Double demandQty; + + @ApiModelProperty(name = "处理数量") + private Double handleQty; + + @ApiModelProperty(name = "操作时间") + private String actionDateTime; + + @ApiModelProperty(name = "创建时间") + private String createDateTime; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java new file mode 100644 index 0000000..d082315 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java @@ -0,0 +1,83 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author ns + * @create 2022/5/31 0031 下午 16:21 + */ +@Data +@ApiModel("对账单查询model") +public class ReconciliaQueryModel implements Serializable { + + @ApiModelProperty(name = "物料编号") + private String partNo; + + @ApiModelProperty(name = "仓库编号") + private String whNo; + + @ApiModelProperty(name = "库存地编号") + private String zoneNo; + + @ApiModelProperty(name = "wms快照时间") + private String wmsSnapshotTime; + + @ApiModelProperty(name = "sap快照时间") + private String sapSnapshotTime; + + @ApiModelProperty(name = "业务类型") + private Integer busiTypeCode; + + @ApiModelProperty(name = "单号") + private String orderNo; + + @ApiModelProperty(name = "单据状态") + public Integer orderStatus; + + @ApiModelProperty(name = "来源存储区") + private String srcZoneNo; + + @ApiModelProperty(name = "目标存储区") + private String destZoneNo; + + @ApiModelProperty(name = "操作开始时间") + private String actionStartDateTime; + + @ApiModelProperty(name = "操作结束时间") + private String actionEndDateTime; + + @ApiModelProperty(name = "创建开始时间") + private String createStartDateTime; + + @ApiModelProperty(name = "创建结束时间") + private String createEndDateTime; + + @ApiModelProperty(name = "库存移动单号") + private String moveNo; + + @ApiModelProperty(name = "移动单状态") + private Integer moveItemStatus; + + @ApiModelProperty(name = "movetoerp状态") + private Integer moveToERPStatus; + + @ApiModelProperty(name = "中间表") + private String middleTable; + + @ApiModelProperty(name = "中间表状态") + private Integer middleTableStatus; + + @ApiModelProperty(name = "是否启用IQ") + private Integer iQEnabled; + + @ApiModelProperty(name = "是否启用OQ") + private Integer oQEnabled; + + @ApiModelProperty(name = "是否启用软适配") + private Integer softswitchEnabled; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaResultModel.java new file mode 100644 index 0000000..7c790b9 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaResultModel.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author ns + * @create 2022/5/31 0031 下午 16:21 + */ +@Data +@ApiModel("对账单结果model") +public class ReconciliaResultModel implements Serializable { +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaSummayResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaSummayResultModel.java new file mode 100644 index 0000000..f2ea22f --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaSummayResultModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author ns + * @create 2022/5/31 0031 下午 16:52 + */ +@Data +@ApiModel("对账单汇总结果model") +public class ReconciliaSummayResultModel implements Serializable { + + @ApiModelProperty(name = "物料编号") + private String partNo; + + @ApiModelProperty(name = "仓库编号") + private String whNo; + + @ApiModelProperty(name = "库存地编号") + private String zoneNo; + + @ApiModelProperty(name = "wms初始库存") + private Double wmsInitialQty; + + @ApiModelProperty(name = "sap初始库存") + private Double sapInitialQty; + + + @ApiModelProperty(name = "wms可用数量") + private Double wmsQty; + + @ApiModelProperty(name = "wmsCOGI") + private Double wmsCOGI; + + @ApiModelProperty(name = "sap可用数量") + private Double sapQty; + + + @ApiModelProperty(name = "sapCOGI") + private Double sapCOGI; + + @ApiModelProperty(name = "差异") + private Double stockDifference; +} From bf386f458083211a0b530cd96e0d293c9cb7c7b7 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 1 Jun 2022 16:18:30 +0800 Subject: [PATCH 41/49] andon --- .../main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java index 4303c7c..b1753cc 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java @@ -34,7 +34,7 @@ public class StationRequestBean extends StationRequestBeanAb implements Serializ ", alarmDetailCode='" + get(alarmDetailCode) + '\'' + ", andonOrderNo='" + get(andonOrderNo) + '\'' + ", msgData=" + get(msgData) + - ", fsmList=" + get(fsmList) + +// ", fsmList=" + get(fsmList) + ", curFsm=" + get(curFsm) + ", triggerEvent='" + get(triggerEvent) + '\'' + ", alarmErrorTime='" + get(alarmErrorTime) + '\'' + From 7432815bfbfd2a6e91428ff5f3cb3b13a10a6d94 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 3 Jun 2022 18:12:47 +0800 Subject: [PATCH 42/49] andon --- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java index f6bdeaa..42418b3 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java @@ -27,6 +27,7 @@ import java.io.Serializable; @Table(name = "ANDON_CONFIG", indexes = { @Index(columnList = "CONFIG_CODE"), @Index(columnList = "CONFIG_CODE, CONFIG_KEY"), + @Index(columnList = "CONFIG_CODE, CONFIG_KEY, CONFIG_VALUE_TYPE"), @Index(columnList = "CONFIG_CODE, CONFIG_KEY, CONFIG_GROUP") }) @Api(value="系统配置") From 9b58ec1623ce3e2443f7612dd794afad74d34070 Mon Sep 17 00:00:00 2001 From: "baoyu.wang" Date: Sun, 5 Jun 2022 11:25:42 +0800 Subject: [PATCH 43/49] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index c47f613..2b02892 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -1168,4 +1168,26 @@ public class WmsStockSn extends BaseBean { this.queueGroupNo = queueGroupNo; this.remark = remark; } + + + public WmsStockSn(String organizeCode, String batchNo, String sn, String workCenterCode, String partNo, + String partNameRdd, String shippingFlag,Double qty, String leftCode, String createUser, String createDatetime, + String modifyUser, String modifyDatetime) { + this.organizeCode = organizeCode; + this.batchNo = batchNo; + this.sn = sn; + this.workCenterCode = workCenterCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.shippingFlag = shippingFlag; + this.qty = qty; + this.leftCode = leftCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + + + + } } From 10967abd1b33701beb58ec1ba8f3ae4d93be2bfb Mon Sep 17 00:00:00 2001 From: nies Date: Mon, 6 Jun 2022 09:25:22 +0800 Subject: [PATCH 44/49] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=B9=E8=B4=A6?= =?UTF-8?q?=E5=8D=95model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/wms/ReconciliaDetailResultModel.java | 27 ++++++------- .../pojo/model/wms/ReconciliaQueryModel.java | 44 +++++++++++----------- .../pojo/wms/bean/snapshot/WmsStockSnSnapshot.java | 6 +++ 3 files changed, 42 insertions(+), 35 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java index c6ef73e..61780ec 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java @@ -13,44 +13,45 @@ import java.io.Serializable; @Data @ApiModel("对账单明细model") public class ReconciliaDetailResultModel implements Serializable { - @ApiModelProperty(name = "物料编号") + @ApiModelProperty(notes = "物料编号") private String partNo; - @ApiModelProperty(name = "库存地编号") + @ApiModelProperty(notes = "库存地编号") private String zoneNo; - @ApiModelProperty(name = "仓库存储区编号") + @ApiModelProperty(notes = "仓库存储区编号") private String whNo; - @ApiModelProperty(name = "业务类型") + @ApiModelProperty(notes = "业务类型") private Integer busiTypeCode; - @ApiModelProperty(name = "IQ状态 正常异常") + @ApiModelProperty(notes = "IQ状态 正常异常") private Integer iQStatus; - @ApiModelProperty(name = "单号") + @ApiModelProperty(notes = "单号") private String orderNo; - @ApiModelProperty(name = "单据状态") + @ApiModelProperty(notes = "单据状态") public Integer orderStatus; - @ApiModelProperty(name = "库存移动单号") + @ApiModelProperty(notes = "库存移动单号") private String moveNo; - @ApiModelProperty(name = "处理数量") + @ApiModelProperty(notes = "处理数量") private Double handleQty; - @ApiModelProperty(name = "移动单状态") + @ApiModelProperty(notes = "移动单状态") private Integer moveItemStatus; - @ApiModelProperty(name = "movetoerp状态") + @ApiModelProperty(notes = "movetoerp状态") private Integer moveToERPStatus; - @ApiModelProperty(name = "中间表状态") + @ApiModelProperty(notes = "中间表状态") private Integer middleTableStatus; - @ApiModelProperty(name = "oQ状态 正常异常") + + @ApiModelProperty(notes = "oQ状态 正常异常") private Integer oQStatus; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java index d082315..3e692ec 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java @@ -14,70 +14,70 @@ import java.io.Serializable; @ApiModel("对账单查询model") public class ReconciliaQueryModel implements Serializable { - @ApiModelProperty(name = "物料编号") + @ApiModelProperty(notes = "物料编号") private String partNo; - @ApiModelProperty(name = "仓库编号") + @ApiModelProperty(notes = "仓库编号") private String whNo; - @ApiModelProperty(name = "库存地编号") + @ApiModelProperty(notes = "库存地编号") private String zoneNo; - @ApiModelProperty(name = "wms快照时间") + @ApiModelProperty(notes = "wms快照时间") private String wmsSnapshotTime; - @ApiModelProperty(name = "sap快照时间") + @ApiModelProperty(notes = "sap快照时间") private String sapSnapshotTime; - @ApiModelProperty(name = "业务类型") + @ApiModelProperty(notes = "业务类型") private Integer busiTypeCode; - @ApiModelProperty(name = "单号") + @ApiModelProperty(notes = "单号") private String orderNo; - @ApiModelProperty(name = "单据状态") + @ApiModelProperty(notes = "单据状态") public Integer orderStatus; - @ApiModelProperty(name = "来源存储区") + @ApiModelProperty(notes = "来源存储区") private String srcZoneNo; - @ApiModelProperty(name = "目标存储区") + @ApiModelProperty(notes = "目标存储区") private String destZoneNo; - @ApiModelProperty(name = "操作开始时间") + @ApiModelProperty(notes = "操作开始时间") private String actionStartDateTime; - @ApiModelProperty(name = "操作结束时间") + @ApiModelProperty(notes = "操作结束时间") private String actionEndDateTime; - @ApiModelProperty(name = "创建开始时间") + @ApiModelProperty(notes = "创建开始时间") private String createStartDateTime; - @ApiModelProperty(name = "创建结束时间") + @ApiModelProperty(notes = "创建结束时间") private String createEndDateTime; - @ApiModelProperty(name = "库存移动单号") + @ApiModelProperty(notes = "库存移动单号") private String moveNo; - @ApiModelProperty(name = "移动单状态") + @ApiModelProperty(notes = "移动单状态") private Integer moveItemStatus; - @ApiModelProperty(name = "movetoerp状态") + @ApiModelProperty(notes = "movetoerp状态") private Integer moveToERPStatus; - @ApiModelProperty(name = "中间表") + @ApiModelProperty(notes = "中间表") private String middleTable; - @ApiModelProperty(name = "中间表状态") + @ApiModelProperty(notes = "中间表状态") private Integer middleTableStatus; - @ApiModelProperty(name = "是否启用IQ") + @ApiModelProperty(notes = "是否启用IQ") private Integer iQEnabled; - @ApiModelProperty(name = "是否启用OQ") + @ApiModelProperty(notes = "是否启用OQ") private Integer oQEnabled; - @ApiModelProperty(name = "是否启用软适配") + @ApiModelProperty(notes = "是否启用软适配") private Integer softswitchEnabled; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java index b00ddde..1627caf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java @@ -269,4 +269,10 @@ public class WmsStockSnSnapshot extends SnapshotBean { this.sumPartQty = sumPartQty; this.locateNo = locateNo; } + + public WmsStockSnSnapshot(String partNo, String whNo, String zoneNo) { + this.partNo = partNo; + this.whNo = whNo; + this.zoneNo = zoneNo; + } } From 35dede6c04c3cfbc6840f72357c9b6378e3b51e9 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 6 Jun 2022 09:33:12 +0800 Subject: [PATCH 45/49] andon --- .../src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java index 6197372..c13ca5c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java @@ -69,4 +69,7 @@ public class FsmModel implements Serializable { @ApiParam("进入触发方法时默认不需要校验外部触发") private boolean checkTriggerTypeFalg = false; + @ApiParam("状态机停在之后处理异常标志") + private boolean handleErrorAfterStopFsmFalg = false; + } From d070ed170c02a206324f21dec75e9285f5b36145 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 10 Jun 2022 16:30:40 +0800 Subject: [PATCH 46/49] andon --- .../model/AndonManageRouteErrorRecordModel.java | 6 ++++++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonManageRouteErrorRecordModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonManageRouteErrorRecordModel.java index bf54e47..57a4c56 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonManageRouteErrorRecordModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonManageRouteErrorRecordModel.java @@ -33,4 +33,10 @@ public class AndonManageRouteErrorRecordModel extends AndonManageRouteErrorRecor @ApiParam(value = "处理状态") private String handleStatusName; + @ApiParam("安灯异常时间开始") + public String alarmErrorTimeStart; + + @ApiParam("安灯异常时间截止") + public String alarmErrorTimeEnd; + } 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 2113e64..437272a 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; import cn.estsh.i3plus.pojo.andon.bean.*; +import cn.estsh.i3plus.pojo.andon.model.AndonManageRouteErrorRecordModel; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -1268,6 +1269,26 @@ public class AndonHqlPack { return packBean; } + /** + * 安灯异常记录 + * @param record + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonManageRouteErrorRecordModel(AndonManageRouteErrorRecordModel record, String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(record.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(record.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringLikerPack(record.getAndonOrderNo(), "andonOrderNo", packBean); + DdlPreparedPack.getNumEqualPack(record.getHandleStatus(), "handleStatus", packBean); + DdlPreparedPack.getStringEqualPack(record.getAlarmCode(), "alarmCode", packBean); + DdlPreparedPack.getStringEqualPack(record.getAlarmDetailCode(), "alarmDetailCode", packBean); + if (!StringUtils.isEmpty(record.getAlarmErrorTimeStart()) || !StringUtils.isEmpty(record.getAlarmErrorTimeEnd())) { + DdlPreparedPack.timeBuilder(record.getAlarmErrorTimeStart(), record.getAlarmErrorTimeEnd(), "alarmErrorTime", packBean, true); + } + return packBean; + } + public static DdlPackBean getConfig(AndonConfig config) { DdlPackBean packBean = getAllBaseDataByNormalPro(config, config.getOrganizeCode()); DdlPreparedPack.getStringLikerPack(config.getConfigCode(), "configCode", packBean); From 7fd4c36e8836f59c52cd67e73a0d3c5dc3537148 Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 15 Jun 2022 09:43:13 +0800 Subject: [PATCH 47/49] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=B9=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E7=9B=B8=E5=85=B3model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 251 +++++++++++++++++++++ .../model/wms/ReconciliaDetailResultModel.java | 32 ++- .../wms/ReconciliaDetailSummaryResultModel.java | 60 ++++- .../pojo/model/wms/ReconciliaQueryModel.java | 6 +- .../i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 8 + .../pojo/wms/bean/WmsDocMovementDetails.java | 10 + .../estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 8 + .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 8 + 8 files changed, 371 insertions(+), 12 deletions(-) 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 72f81e1..5b371b0 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 @@ -9834,6 +9834,257 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 单据在 move To erp 中的状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MOVE_TO_ERP_STATUS { + NOT_CRETED(10, "NOT_CRETED", "未创建"), + CREATED(20, "CREATED", "已创建"), + SYNCED(30, "IS_SYNC", "已回传"), + ; + + private int value; + private String code; + private String description; + + MOVE_TO_ERP_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 WmsEnumUtil.MOVE_TO_ERP_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; + } + } + + /** + * 单据在 oq 中的状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OQ_STATUS { + NORMAL(10, "NORMAL", "正常"), + ABNORMAL(20, "ABNORMAL", "异常"), + ; + + private int value; + private String code; + private String description; + + OQ_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 WmsEnumUtil.OQ_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; + } + } + + /** + * 单据在 iq 中的状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IQ_STATUS { + NORMAL(10, "NORMAL", "正常"), + ABNORMAL(20, "ABNORMAL", "异常"), + ; + + private int value; + private String code; + private String description; + + IQ_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 WmsEnumUtil.IQ_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; + } + } + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java index 61780ec..1f8f863 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java @@ -17,11 +17,11 @@ public class ReconciliaDetailResultModel implements Serializable { private String partNo; - @ApiModelProperty(notes = "库存地编号") - private String zoneNo; + @ApiModelProperty(name = "库存地编号") + private String areaNo; - @ApiModelProperty(notes = "仓库存储区编号") - private String whNo; + @ApiModelProperty(notes = "存储区编号") + private String zoneNo; @ApiModelProperty(notes = "业务类型") private Integer busiTypeCode; @@ -29,20 +29,20 @@ public class ReconciliaDetailResultModel implements Serializable { @ApiModelProperty(notes = "IQ状态 正常异常") private Integer iQStatus; - @ApiModelProperty(notes = "单号") - private String orderNo; + @ApiModelProperty(notes = "关联单号") + private String refSrcOrderNo; - @ApiModelProperty(notes = "单据状态") - public Integer orderStatus; + @ApiModelProperty(notes = "关联单据状态") + public Integer refSrcOrderStatus; @ApiModelProperty(notes = "库存移动单号") - private String moveNo; + private String moveOrderNo; @ApiModelProperty(notes = "处理数量") private Double handleQty; @ApiModelProperty(notes = "移动单状态") - private Integer moveItemStatus; + private Integer moveOrderStatus; @ApiModelProperty(notes = "movetoerp状态") private Integer moveToERPStatus; @@ -55,4 +55,16 @@ public class ReconciliaDetailResultModel implements Serializable { private Integer oQStatus; + public ReconciliaDetailResultModel(String partNo,String areaNo,String zoneNo,Integer busiTypeCode,String refSrcOrderNo,Integer refSrcOrderStatus,String moveOrderNo,Double handleQty,Integer moveOrderStatus ){ + this.partNo = partNo; + this.areaNo = areaNo; + this.zoneNo = zoneNo; + this.busiTypeCode = busiTypeCode; + this.refSrcOrderNo = refSrcOrderNo; + this.refSrcOrderStatus = refSrcOrderStatus; + this.moveOrderNo = moveOrderNo; + this.handleQty = handleQty; + this.moveOrderStatus = moveOrderStatus; + } + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java index 5bbf1f7..d742422 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.wms; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; @@ -11,6 +12,7 @@ import java.io.Serializable; * @create 2022/5/31 0031 下午 16:52 */ @Data +@NoArgsConstructor @ApiModel("对账单查询model") public class ReconciliaDetailSummaryResultModel implements Serializable { @ApiModelProperty(name = "物料编号") @@ -18,7 +20,7 @@ public class ReconciliaDetailSummaryResultModel implements Serializable { @ApiModelProperty(name = "库存地编号") - private String zoneNo; + private String areaNo; @ApiModelProperty(name = "来源存储区") private String srcZoneNo; @@ -44,4 +46,60 @@ public class ReconciliaDetailSummaryResultModel implements Serializable { @ApiModelProperty(name = "创建时间") private String createDateTime; + + @ApiModelProperty(name = "关联单号") + public String refSrc; + + + @ApiModelProperty(name = "订单号") + public String orderNo; + + + public ReconciliaDetailSummaryResultModel(String partNo,String srcZoneNo,String destZoneNo,Integer busiTypeCode,Integer orderStatus,String refSrc,String orderNo){ + this.partNo = partNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.busiTypeCode = busiTypeCode; + this.orderStatus = orderStatus; + this.refSrc = refSrc; + this.orderNo = orderNo; + } + + public ReconciliaDetailSummaryResultModel(Double demandQty){ + this.demandQty = demandQty; + } + + public ReconciliaDetailSummaryResultModel(String partNo,String srcZoneNo,String destZoneNo,Integer busiTypeCode,Integer orderStatus,String orderNo,Double handleQty){ + this.partNo = partNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.busiTypeCode = busiTypeCode; + this.orderStatus = orderStatus; + this.orderNo = orderNo; + this.handleQty = handleQty; + } + public ReconciliaDetailSummaryResultModel(String partNo,String areaNo, String srcZoneNo,String destZoneNo,Integer busiTypeCode,Integer orderStatus,Double demandQty, Double handleQty){ + this.partNo = partNo; + this.areaNo = areaNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.busiTypeCode = busiTypeCode; + this.orderStatus = orderStatus; + this.demandQty = demandQty; + this.handleQty = handleQty; + } + + public ReconciliaDetailSummaryResultModel(String partNo, String srcZoneNo,String destZoneNo,Integer busiTypeCode,Integer orderStatus,Double demandQty, Double handleQty){ + this.partNo = partNo; + this.areaNo = areaNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.busiTypeCode = busiTypeCode; + this.orderStatus = orderStatus; + this.demandQty = demandQty; + this.handleQty = handleQty; + } + + + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java index 3e692ec..a9bc7fb 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java @@ -20,8 +20,12 @@ public class ReconciliaQueryModel implements Serializable { @ApiModelProperty(notes = "仓库编号") private String whNo; + /** + * 库存地 + * 前端输入，sap中的字段 + */ @ApiModelProperty(notes = "库存地编号") - private String zoneNo; + private String areaNo; @ApiModelProperty(notes = "wms快照时间") private String wmsSnapshotTime; 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 9cf635d..12dc4b1 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 @@ -159,4 +159,12 @@ public class WmsASNMasterDetails extends BaseBean { this.planDate = planDate; this.planTime = planTime; } + + public WmsASNMasterDetails(Double recQty,Double qty,String partNo,String orderNo ,String erpAreaNo){ + this.recQty = recQty; + this.qty = qty; + this.partNo = partNo; + this.orderNo = orderNo; + this.erpAreaNo = erpAreaNo; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index a381d13..28da699 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -838,4 +838,14 @@ public class WmsDocMovementDetails extends BaseBean { this.partNo = partNo; this.outQty = outQty; } + + public WmsDocMovementDetails(Double recQty,Double qty,String partNo,String orderNo,String srcZoneNo, String destZoneNo ,String areaNo){ + this.recQty = recQty; + this.qty = qty; + this.partNo = partNo; + this.orderNo = orderNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.srcAreaNo = areaNo; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 59aa838..6ffa005 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -296,4 +296,12 @@ public class WmsMoveToERP extends BaseBean { this.destAreaNo = destAreaNo; this.transQtySum = transQtySum; } + + public WmsMoveToERP( Long id, String orderNo, String refSrc, Long sid, Integer isSync) { + this.id = id; + this.orderNo = orderNo; + this.refSrc = refSrc; + this.shippingId = sid; + this.isSync = isSync; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 006abbd..40f6819 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -370,4 +370,12 @@ public class WmsPOMasterDetails extends BaseBean { this.sumRcQty = sumRcQty; } + public WmsPOMasterDetails(Double rcQty,Double qty,String partNo,String orderNo,String erpAreaNo){ + this.erpAreaNo = erpAreaNo; + this.rcQty = rcQty; + this.qty = qty; + this.partNo = partNo; + this.orderNo = orderNo; + } + } From 7eeadf733b65e63b588c266dfc410ad51d50ceaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=8B=E9=B8=BF=E8=BE=89?= <2579728558@qq.com> Date: Mon, 20 Jun 2022 13:46:46 +0800 Subject: [PATCH 48/49] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=85=8D=E6=96=B9?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81?= =?UTF-8?q?,=E9=97=A8=E6=A8=A1=E4=BD=8D=E7=BD=AE=E5=88=97=EF=BC=88MesPartF?= =?UTF-8?q?ormula=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java index efbd139..7fe522e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java @@ -57,4 +57,12 @@ public class MesPartFormula extends BaseBean implements Serializable { @ApiParam("参照数量") private Integer referQty; + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("门模位置") + private String produceCtgyCode; + } From 885bc0fa05fb3512ce68928ab9987a459342265f Mon Sep 17 00:00:00 2001 From: nies Date: Mon, 20 Jun 2022 15:01:50 +0800 Subject: [PATCH 49/49] =?UTF-8?q?core=20UserModel=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java index 571f83b..c747c11 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java @@ -36,9 +36,18 @@ public class UserDetailModel extends BaseBean { @ApiParam(value ="登陆名称" , access ="登陆名称") private String userLoginName; + /** + * 新增用户和账号时前端输入的 【密码】 + */ + @ApiParam(value ="密码") + private String password; + /** + * 新增用户和账号时前端输入的 【确认密码】 + */ @ApiParam(value ="登陆密码") private String userLoginPassword; + @ApiParam(value ="邮箱" , access ="邮箱") private String userEmail;