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 aee1f19..633422a 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 @@ -2928,4 +2928,38 @@ public class WmsEnumUtil { return value; } } + + /** + * 条码类型 10=实物条码，20=虚拟条码 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WMS_STOCK_TYPE { + SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"); + + private int value; + private String description; + + WMS_STOCK_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; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java index 8c963a4..e4b74f9 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.platform; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import lombok.Data; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; /** @@ -13,7 +14,9 @@ import java.util.List; * @Modify: **/ @Data -public class CommonTreeModel { +public class CommonTreeModel implements Serializable { + + private static final long serialVersionUID = -3612131411549787983L; private BaseBean bean; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java index 0759bd3..ce51116 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate; import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -14,7 +15,9 @@ import java.util.List; * @Modify: **/ @Data -public class LabelTemplateModel { +public class LabelTemplateModel implements Serializable { + + private static final long serialVersionUID = 2488615810903387414L; private SysLabelTemplate labelTemplate; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java index 442e0a2..62546d3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -12,8 +14,9 @@ import lombok.Data; * @Modify: **/ @Data -public class MessagePagerModel { +public class MessagePagerModel implements Serializable { + private static final long serialVersionUID = 6236940647561791913L; private SysMessage sysMessage; private Pager pager; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RefUserMessagePagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RefUserMessagePagerModel.java index 97b20df..4eb0420 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RefUserMessagePagerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RefUserMessagePagerModel.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -12,8 +14,9 @@ import lombok.Data; * @Modify: **/ @Data -public class RefUserMessagePagerModel { +public class RefUserMessagePagerModel implements Serializable { + private static final long serialVersionUID = -4109915131051843577L; private SysRefUserMessage sysRefUserMessage; private Pager pager; 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 5ff8bed..3a35968 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 @@ -22,6 +22,8 @@ import java.util.List; @Data public class UserDetailModel extends BaseBean { + + private static final long serialVersionUID = 4413526491980249893L; @ApiParam(value ="账号ID") private String userId; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java index 80c430e..cdc3da2 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.model.platform; import cn.estsh.i3plus.pojo.base.common.Pager; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -11,8 +13,10 @@ import lombok.Data; * @Modify: **/ @Data -public class UserDetailPagerModel { +public class UserDetailPagerModel implements Serializable { + + private static final long serialVersionUID = -5347423781211585908L; private UserDetailModel userDetailModel; private Pager pager; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java index 4ca730e..b8c77f1 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysRole; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -12,8 +14,9 @@ import lombok.Data; * @Modify: **/ @Data -public class UserRolePagerModel { +public class UserRolePagerModel implements Serializable { + private static final long serialVersionUID = 6180855492105859082L; private SysRole sysRole; private Pager pager; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java index d5ffa91..234778b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.platform.bean; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : 邮件配置信息 * @Reference : @@ -11,8 +13,9 @@ import lombok.Data; * @Modify: **/ @Data -public class MailConfig { +public class MailConfig implements Serializable { + private static final long serialVersionUID = -6776607385471325344L; @ApiParam(value = "邮箱开关") private int mailSwitch; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index 3ee307d..c2ad1d4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -16,6 +16,11 @@ import java.util.List; @Data public class SessionUser implements Serializable { + private static final long serialVersionUID = -6478598185766500419L; + + @ApiParam("会话ID") + private String token; + @ApiParam("用户ID") private Long userId; @@ -32,6 +37,9 @@ public class SessionUser implements Serializable { @ApiParam("用户类型") private String userType; + @ApiParam("用户登录平台") + private Integer loginPlatform; + @ApiParam("用户信息") private SysUser user; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java index 61c82cc..a0b2a6a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value="条码规则",description = "条码规则") public class SysBarcodeRule extends BaseBean { + private static final long serialVersionUID = -2041412527908996307L; @Column(name = "NAME") @ApiParam(value = "规则名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index 85501de..3ab55af 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value="系统配置",description = "系统配置") public class SysConfig extends BaseBean { + private static final long serialVersionUID = 2718495807943432629L; @Column(name="NAME") @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java index 69f2625..79daa0f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java @@ -32,6 +32,7 @@ import java.util.List; @Api(value="部门",description = "部门") public class SysDepartment extends BaseBean { + private static final long serialVersionUID = -1505054622781210062L; @Column(name="NAME") @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java index 5eaa6c5..32929c7 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java @@ -31,6 +31,7 @@ import javax.persistence.Table; @Api(value="系统字典",description = "系统字典") public class SysDictionary extends BaseBean { + private static final long serialVersionUID = 593801368328634592L; @Column(name="NAME") @ApiParam(value ="字典名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterprise.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterprise.java index 626eef0..460bbfe 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterprise.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterprise.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="企业信息",description = "企业信息") public class SysEnterprise extends BaseBean { + private static final long serialVersionUID = -2138074947458189045L; @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterpriseConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterpriseConfig.java index 46d607e..4ae6fa6 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterpriseConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterpriseConfig.java @@ -31,6 +31,7 @@ import java.text.DecimalFormat; @Api(value="企业配置信息",description = "企业配置信息") public class SysEnterpriseConfig extends BaseBean { + private static final long serialVersionUID = -6131429295344210675L; @Column(name="ENTERPRISE_ID") @ApiParam(value ="企业id" , example = "0") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java index 814ba4f..fefa471 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @Api("工厂仓库") public class SysFactoryStore extends BaseBean { + private static final long serialVersionUID = 6717712070974796221L; @Column(name="store_code") @ApiParam("仓库代码") private String storeCode; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java index 6da63b3..ff0c38f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java @@ -31,6 +31,7 @@ import java.text.DecimalFormat; @Api(value="文件",description = "文件") public class SysFile extends BaseBean { + private static final long serialVersionUID = 623700632055475696L; @Column(name="NAME") @ApiParam(value ="文件名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFileAttach.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFileAttach.java index 72f47cc..256ee0a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFileAttach.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFileAttach.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="文件附件",description = "文件附件") public class SysFileAttach extends BaseBean { + private static final long serialVersionUID = -6730529794381568890L; @Column(name="ATTACH_SOFT_TYPE") @ApiParam(value ="附件所属模块") private Integer attachSoftType; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index 39eb527..339fb7e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -27,6 +27,7 @@ import javax.persistence.*; @Api(value="打印模板",description = "打印模板") public class SysLabelTemplate extends BaseBean { + private static final long serialVersionUID = 5371856566557305323L; @Column(name="TEMPLATE_CODE") @ApiParam(value ="模板代码") private String templateCode; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java index 4654f76..92e08e2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java @@ -29,6 +29,7 @@ import javax.persistence.*; @Api(value="打印模板参数",description = "打印模板参数") public class SysLabelTemplateParam extends BaseBean { + private static final long serialVersionUID = 6476163540527157643L; @Column(name="TEMPLATE_ID") @ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java index 7f4d218..61f5c39 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java @@ -24,6 +24,7 @@ import javax.persistence.Table; @Api(value="系统语言表",description = "对系统语言进行匹配。") public class SysLocaleLanguage extends BaseBean { + private static final long serialVersionUID = -1904007575555304772L; @Column(name="LANGUAGE_NAME") @ApiParam(value = "语言名称",example = "前台显示的名称") private String languageName; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index 1a6f01a..8289035 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -29,6 +29,7 @@ import javax.persistence.Transient; @Api(value="系统资源",description = "对按钮、功能、信息提示等进行转换。") public class SysLocaleResource extends BaseBean { + private static final long serialVersionUID = -2397207310100672746L; @Column(name="resource_type") @ApiParam(value = "资源类型",example = "1",access = "使用枚举：CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE") private Integer resourceType; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java index 4be79ff..f1a39bf 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="用户登录记录",description = "用户登录记录") public class SysLogUserLogin extends BaseBean { + private static final long serialVersionUID = 4665598896654312569L; @Column(name="USER_ID") @ApiParam(value ="用户ID" , access ="用户ID") private Long userId; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 4c9d314..0e0cbab 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -32,6 +32,7 @@ import java.util.List; @Api(value="系统功能",description = "系统功能") public class SysMenu extends BaseBean { + private static final long serialVersionUID = 6892387964234712323L; @Column(name="NAME") @ApiParam(value ="功能名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index 695c519..8eacda3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -31,6 +31,7 @@ import java.util.List; @Api(value = "系统消息", description = "系统消息") public class SysMessage extends BaseBean { + private static final long serialVersionUID = -6090909263221993356L; @Column(name = "MESSAGE_TITLE") @ApiParam(value = "消息标题", access = "消息标题") private String messageTitle; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java index 258e35d..6bb092f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java @@ -33,6 +33,7 @@ import javax.persistence.Table; @Api(value="单号规则",description = "单号规则") public class SysOrderNoRule extends BaseBean { + private static final long serialVersionUID = -283233170141936426L; @Column(name = "NAME") @ApiParam(value = "规则名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java index fbbfbe2..2bb58d7 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java @@ -33,6 +33,7 @@ import java.util.List; @Api(value="组织",description = "组织") public class SysOrganize extends BaseBean { + private static final long serialVersionUID = 5932340027033720434L; @Column(name="NAME") @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java index 513f3c2..1479652 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java @@ -32,6 +32,7 @@ import java.util.List; @Api(value="岗位",description = "岗位") public class SysPosition extends BaseBean { + private static final long serialVersionUID = -3438901661332705721L; @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java index 1851937..68dabba 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java @@ -31,6 +31,7 @@ import java.text.DecimalFormat; @Api(value="关系-角色菜单",description = "关系-角色菜单") public class SysRefRoleMenu extends BaseBean { + private static final long serialVersionUID = -2013469818246101184L; @Column(name="MENU_ID") @ApiParam(value ="菜单ID" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java index 58f2528..272f76c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="关系-任务周期与计划",description = "关系-任务周期与计划") public class SysRefTaskCyclePlan extends BaseBean { + private static final long serialVersionUID = 5217923903994138624L; @Column(name="TASK_CYCLE_ID") @ApiParam(value ="任务周期id" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java index 5350620..bcb6a0a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java @@ -31,6 +31,7 @@ import java.text.DecimalFormat; @Api(value="关系-账号部门",description = "关系-账号部门") public class SysRefUserDepartment extends BaseBean { + private static final long serialVersionUID = -2361062982274833764L; @Column(name="USER_ID") @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserInfoDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserInfoDepartment.java index 81dc295..c465eb5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserInfoDepartment.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserInfoDepartment.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="关系-用户部门",description = "关系-用户部门") public class SysRefUserInfoDepartment extends BaseBean { + private static final long serialVersionUID = -1023456569329939973L; @Column(name="USER_ID") @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java index 7d02db8..6caccdc 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java @@ -31,6 +31,7 @@ import javax.persistence.Table; @Api(value="关系-用户消息",description = "关系-用户消息") public class SysRefUserMessage extends BaseBean { + private static final long serialVersionUID = 555705651072659162L; @Column(name="MESSAGE_ID") @ApiParam(value ="消息id" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserPosition.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserPosition.java index b323292..77eff8c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserPosition.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserPosition.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="关系-用户岗位",description = "关系-用户岗位") public class SysRefUserPosition extends BaseBean { + private static final long serialVersionUID = 3234085587521697199L; @Column(name="USER_ID") @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java index 223afa8..b6bdcc9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java @@ -30,7 +30,7 @@ import javax.persistence.Table; @Api(value="关系-用户角色",description = "关系-用户角色") public class SysRefUserRole extends BaseBean { - + private static final long serialVersionUID = -2253689528880200360L; @Column(name="USER_ID") @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java index 6e8adc4..9786250 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java @@ -32,6 +32,7 @@ import javax.persistence.Table; @Api(value="用户角色表",description = "用户权限角色。") public class SysRole extends BaseBean { + private static final long serialVersionUID = -869130572226447415L; @Column(name="NAME") @ApiParam(value ="角色名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java index d861209..2b54d99 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value="任务",description = "任务") public class SysTask extends BaseBean { + private static final long serialVersionUID = -4462661508105857312L; @Column(name="NAME") @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskCycle.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskCycle.java index e4d43e4..de6575e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskCycle.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskCycle.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value="任务周期",description = "任务周期") public class SysTaskCycle extends BaseBean { + private static final long serialVersionUID = 6821425488105955756L; @Column(name="NAME") @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java index df65a54..6b239f8 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java @@ -32,6 +32,7 @@ import javax.persistence.Table; @Api(value = "任务计划", description = "任务计划") public class SysTaskPlan extends BaseBean { + private static final long serialVersionUID = -136675837627794707L; @Column(name = "NAME") @ApiParam(value = "名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java index 2a03f16..2887e9f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java @@ -37,6 +37,7 @@ import javax.persistence.Table; @Api(value="硬件设备表",description = "硬件设备表") public class SysTool extends BaseBean { + private static final long serialVersionUID = 100098534186501411L; @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysToolType.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysToolType.java index bd8eeb0..4765ce2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysToolType.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysToolType.java @@ -29,6 +29,7 @@ import java.text.DecimalFormat; @Api(value="设备类型",description = "设备类型") public class SysToolType extends BaseBean { + private static final long serialVersionUID = 6736217130492256001L; @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; 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 af22709..b607923 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 @@ -32,6 +32,7 @@ import java.util.List; @Api(value="账号登陆表",description = "账号登陆系统账户。") public class SysUser extends BaseBean { + private static final long serialVersionUID = 3721769401146979123L; @Column(name="USER_INFO_ID") @ApiParam(value ="人员ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index 7ac1d95..51d7362 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -34,6 +34,8 @@ import java.util.List; @Api(value="用户详细",description = "用户详细") public class SysUserInfo extends BaseBean { + private static final long serialVersionUID = 3876318482048754222L; + @Column(name="USER_ID") @ApiParam(value ="账号ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestTransUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestTransUser.java index 7f5be42..8751bde 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestTransUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestTransUser.java @@ -32,6 +32,7 @@ import javax.persistence.Version; @Api(value="测试用户类",description = "测试事务信息") public class TestTransUser extends BaseBean { + private static final long serialVersionUID = 3860279685301736213L; @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; 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 1fdbf92..2e6e363 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 @@ -109,9 +109,8 @@ public class WmsStockSn extends BaseBean { private String unit; @Column(name = "QTY") - @ColumnDefault("0") @ApiParam(value = "数量", example = "0") - private Double qty; + private Double qty = 0d; /** * 质量状态:10=合格,20=不合格,30=隔离 @@ -155,6 +154,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "工作中心代码") private String workCenterCode; + @Column(name = "SN_TYPE") + @ApiParam(value = "条码类型", example = "10") + private Integer snType = 10; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd;