From 8ebc96d1f7da49bc252ef6cbf616894976b1cb2f Mon Sep 17 00:00:00 2001 From: nies Date: Tue, 15 Mar 2022 17:35:39 +0800 Subject: [PATCH 1/8] =?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 2/8] =?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 3/8] =?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 4/8] =?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 5/8] =?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 f843878e7e66504d1bce8a6d7bedc73bdf702a90 Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 30 Mar 2022 15:07:09 +0800 Subject: [PATCH 6/8] =?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 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9SysTableTemplate=E7=B4=A2?= =?UTF-8?q?=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 8/8] =?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;