From e01f9a5570a91f6acaa99b8973a09c0b5846978e Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Tue, 29 Mar 2022 15:55:56 +0800 Subject: [PATCH 1/4] =?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 37d7b461f6a7f26030735117b96d28aebb45dab0 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Wed, 27 Apr 2022 14:16:53 +0800 Subject: [PATCH 2/4] =?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 3/4] =?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 4/4] =?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; }