From 04f1da7f3f5a04087f13f255e8687c1072e9a3b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 25 Dec 2020 10:37:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=903057=20=E5=8C=85=E8=A3=85=E5=B1=A5?= =?UTF-8?q?=E5=8E=86=E6=8A=A5=E8=A1=A8=20-=20=E5=90=8E=E7=AB=AF=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 158ed97..ff0bbdf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -203,6 +203,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam(value = "生产线名称") private String workCenterName; + @Transient + @ApiParam("工序名称") + private String processName; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 1c1a2b0..0dacf19 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3692,7 +3692,8 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean); DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); + DdlPreparedPack.getStringRightLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); + DdlPreparedPack.getStringRightLikerPack(mesPackage.getCtNo(), "ctNo", packBean); DdlPreparedPack.getStringBiggerPack(mesPackage.getCreateDateTimeStart(), "createDatetime", packBean); DdlPreparedPack.getStringSmallerPack(mesPackage.getCreateDateTimeEnd(), "createDatetime", packBean); return packBean; From b20fc8e55236145a682b5a2cb2dfecd86b493b14 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 25 Dec 2020 11:48:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=80=BB=E8=A3=85=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=8D=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 1 + .../pojo/mes/bean/MesWorkCellJumpRecord.java | 52 ---------------------- .../MesWorkCellJumpRecordRepository.java | 16 ------- 3 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 0c83988..c03278f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -4231,6 +4231,7 @@ public class MesPcnEnumUtil { public enum PRODUCE_ERROR_RECORD { JUMP_PROCESS(10, "跳过工序"), JUMP_STEP(20, "跳过工步"), + JUMP_STEP_IN_STATE(25, "跳过状态点中的工步"), JUMP_STATE(30, "跳过状态点"), ABNORMAL_DEDUCTION(40, "扣减异常"), REDO_STATION(50, "工位重做"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java deleted file mode 100644 index de9d7e6..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.*; -import java.io.Serializable; - -/** - * @Description :工位操作跳过记录表 - * @Reference : - * @Author : wangjie - * @CreateDate : 2020-12-24 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_WORK_CELL_JUMP_RECORD") -@Api("mes工位操作跳过记录表") -public class MesWorkCellJumpRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = 1017369816822438021L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "JUMP_TYPE") - @ApiParam("跳过类型 10=过程条码") - private Integer jumpType; - - @Column(name = "JUMP_VALUE") - @ApiParam("跳过值") - private String jumpValue; - - @Column(name = "JUMP_DESC") - @ApiParam("跳过描述") - private String jumpDesc; - -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java deleted file mode 100644 index 6a3f7a7..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellJumpRecord; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesWorkCellJumpRecordRepository extends BaseRepository { -} From 819a4312ae274d2519a144c9748aa01ca6971c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 25 Dec 2020 13:37:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=96=9C=E5=BE=B7WMS=EF=BC=9ABUG#13293?= =?UTF-8?q?=EF=BC=8C13295=EF=BC=8C13294?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 7d27d82..5ba84cf 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 @@ -740,4 +740,22 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.destLocateName = locateName; } + public WmsDocMovementDetails(String organizeCode, String workOrderCode, String orderNo,Integer moveType, Integer busiType, + String item, String partNo, String partNameRdd,String unit, Double qty, + Integer isSn, Integer orderMasterStatus,String createUser, String createDatetime) { + this.organizeCode = organizeCode; + this.workOrderCode = workOrderCode; + this.orderNo = orderNo; + this.moveType = moveType; + this.busiType = busiType; + this.item = item; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.qty = qty; + this.isSn = isSn; + this.orderMasterStatus = orderMasterStatus; + this.createUser = createUser; + this.createDatetime = createDatetime; + } } From 60ef8f3b96fb16e173bfe33b8a9a4bf55d556a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 25 Dec 2020 13:50:37 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat(sms):=E5=B9=B3=E5=8F=B0=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 165 ++++++++++++++++++++- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 12 ++ .../i3plus/pojo/model/common/ImppSmsContent.java | 38 +++++ .../pojo/platform/bean/SysSmsSendRecord.java | 128 ++++++++++++++++ .../i3plus/pojo/platform/bean/SysSmsSign.java | 54 +++++++ .../i3plus/pojo/platform/bean/SysSmsTemplate.java | 101 +++++++++++++ .../repository/SysSmsSendRecordRepository.java | 14 ++ .../platform/repository/SysSmsSignRepository.java | 14 ++ .../repository/SysSmsTemplateRepository.java | 14 ++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 157 +++++++++++++++----- 10 files changed, 661 insertions(+), 36 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppSmsContent.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSign.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSendRecordRepository.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSignRepository.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsTemplateRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index c18a856..017b3c5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1081,7 +1081,8 @@ public class ImppEnumUtil { BASIS(5, "基础"), CONFIG(6, "系统配置"), LOG(7, "日志配置"), - WORK_WECHAT(8, "企业微信配置"); + WORK_WECHAT(8, "企业微信配置"), + SMS(9, "短信配置"); private int value; private String description; @@ -1471,4 +1472,166 @@ public class ImppEnumUtil { return null; } } + + /** + * 短信供应商 + */ + public enum SMS_SUPPLIER { + + ALI_CLOUD(1, "阿里云"); + + private int value; + private String description; + + SMS_SUPPLIER() { + } + + SMS_SUPPLIER(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; + } + + public static SMS_SUPPLIER valueOf(int val) { + SMS_SUPPLIER tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i]; + } + } + return tmp; + } + } + + /** + * 短信模板状态 + */ + public enum SMS_TEMPLATE_STATUS { + VER_CODE(10, "审核中"), + NOTICE_SMS(20, "审核通过"), + PROMOTE_SMS(30, "审核失败"); + + private int value; + private String description; + + SMS_TEMPLATE_STATUS() { + } + + SMS_TEMPLATE_STATUS(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; + } + } + + /** + * 短信模板类型 + */ + public enum SMS_TEMPLATE_TYPE { + VER_CODE(10, "验证码"), + NOTICE_SMS(20, "短信通知"), + PROMOTE_SMS(30, "推广短信"), + INTL_SMS(40, "国际/港澳台消息"); + + private int value; + private String description; + + SMS_TEMPLATE_TYPE() { + } + + SMS_TEMPLATE_TYPE(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; + } + } + + /** + * 短信发送状态 + */ + public enum SMS_SEND_STATUS { + WAIT_RECEIPT(10, "等待回执"), + FAIL(20, "发送失败"), + SUCCESS(30, "发送成功"); + + private int value; + private String description; + + SMS_SEND_STATUS() { + } + + SMS_SEND_STATUS(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; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 8daabbc..eaafc21 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -294,6 +294,18 @@ public class DdlPreparedPack { } /** + * 不建议使用该方法，仅在特殊情况下使用。 + * 如sqlserver库中不允许对长数据字段进行=判断，可使用like替换 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikeEqualPack(String val, String columnName, DdlPackBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val); + } + } + + /** * 封装String对象成不等于语句 * * @param columnName 列名 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppSmsContent.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppSmsContent.java new file mode 100644 index 0000000..eb94499 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppSmsContent.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.model.common; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Map; + +/** + * @Description : Impp短信内容 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-24 20:31 + * @Modify: + **/ +@Data +@ApiModel("Impp短信内容") +public class ImppSmsContent implements Serializable { + + private static final long serialVersionUID = 3329812596753451793L; + + @ApiModelProperty(value = "软件模块") + private Integer softType; + + @ApiModelProperty(value = "接收手机号") + private String receivePhoneNumber; + + @ApiModelProperty(value = "短信签名代码") + private String smsSignCode; + + @ApiModelProperty(value = "模板代码") + private String templateCode; + + @ApiModelProperty(value = "短信参数") + private Map paramMap; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java new file mode 100644 index 0000000..64f297f --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java @@ -0,0 +1,128 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-13 16:13 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SYS_SMS_SEND_RECORD") +@ApiModel(value = "短信发送记录", description = "短信发送记录") +public class SysSmsSendRecord extends BaseBean { + + private static final long serialVersionUID = -3745690058553350416L; + + /** + * 发送回执ID + */ + @Column(name = "BIZ_ID") + @ApiModelProperty(value = "回执id") + private String bizId; + + /** + * 软件模块 + */ + @Column(name = "SOFT_TYPE") + @ApiModelProperty(value = "软件模块") + private Integer softType; + + /** + * 接收手机号 + */ + @Column(name = "RECEIVE_PHONE_NUMBER") + @ApiModelProperty(value = "接收手机号") + private String receivePhoneNumber; + + /** + * 模板代码 + */ + @Column(name = "TEMPLATE_CODE") + @ApiModelProperty(value = "模板代码") + private String templateCode; + + /** + * 模板名称 + */ + @Column(name = "TEMPLATE_NAME") + @ApiModelProperty(value = "模板名称") + private String templateName; + + /** + * 短信签名代码 + */ + @Column(name = "SMS_SIGN_CODE") + @ApiModelProperty(value = "短信签名代码") + private String smsSignCode; + + /** + * 短信签名 + */ + @Column(name = "SMS_SIGN") + @ApiModelProperty(value = "短信签名") + private String smsSign; + + /** + * 短信内容 + */ + @Column(name = "SMS_CONTENT") + @ApiModelProperty(value = "短信内容") + private String smsContent; + + /** + * 短信内容 + */ + @Column(name = "SMS_Param", length = 1000) + @ApiModelProperty(value = "短信参数") + private String smsParam; + + /** + * 短信发送状态 + */ + @AnnoOutputColumn(refClass = ImppEnumUtil.SMS_SEND_STATUS.class) + @Column(name = "SMS_SEND_STATUS") + @ApiModelProperty(value = "短信发送状态") + private Integer smsSendStatus; + + /** + * 短信发送时间 + */ + @Column(name = "SEND_DATE_TIME") + @ApiModelProperty(value = "短信发送时间") + private String sendDateTime; + + /** + * 短信接收日期和时间 + */ + @Column(name = "RECEIVE_DATE_TIME") + @ApiModelProperty(value = "短信接收日期和时间") + private String receiveDateTime; + + /** + * 短信发送异常信息 + */ + @Lob + @Column(name = "SEND_ERR_MSG") + @ApiModelProperty(value = "短信发送异常信息") + private String sendErrMsg; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSign.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSign.java new file mode 100644 index 0000000..e3a4ef8 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSign.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 短信签名 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-13 16:09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SYS_SMS_SIGN") +@ApiModel(value = "短信签名", description = "短信签名") +public class SysSmsSign extends BaseBean { + + private static final long serialVersionUID = -8979657974497978428L; + + /** + * 签名 + */ + @Column(name = "SIGN_NAME") + @ApiModelProperty(value = "签名") + private String signName; + + /** + * 签名代码 + */ + @Column(name = "SIGN_CODE") + @ApiModelProperty(value = "签名代码") + private String signCode; + + /** + * 签名描述 + */ + @Column(name = "SIGN_DESC") + @ApiModelProperty(value = "签名描述") + private String signDesc; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java new file mode 100644 index 0000000..c298f3e --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java @@ -0,0 +1,101 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : 短信模板 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-13 16:11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SYS_SMS_TEMPLATE") +@ApiModel(value = "短信模板", description = "短信模板") +public class SysSmsTemplate extends BaseBean { + + private static final long serialVersionUID = -3879367761511016412L; + + /** + * 模板名称 + */ + @Column(name = "TEMPLATE_NAME") + @ApiModelProperty(value = "模板名称") + private String templateName; + + /** + * 模板代码 + */ + @Column(name = "TEMPLATE_CODE") + @ApiModelProperty(value = "模板代码") + private String templateCode; + + /** + * 模板代码 + */ + @Column(name = "SUPPLIER_TEMPLATE_CODE") + @ApiModelProperty(value = "模板代码") + private String supplierTemplateCode; + + /** + * 模板类型 + */ + @Column(name = "TEMPLATE_TYPE") + @ApiModelProperty(value = "模板类型") + private Integer templateType; + + /** + * 供应商类型 + */ + @Column(name = "SUPPLIER_TYPE") + @ApiModelProperty(value = "供应商类型") + private Integer supplierType; + + /** + * 模板状态 + */ + @Column(name = "TEMPLATE_STATUS") + @ApiModelProperty(value = "模板状态") + @AnnoOutputColumn(refClass = ImppEnumUtil.SMS_TEMPLATE_STATUS.class) + private Integer templateStatus; + + /** + * 模板内容 + */ + @Column(name = "TEMPLATE_CONTENT") + @ApiModelProperty(value = "模板内容") + private String templateContent; + + /** + * 模板描述 + */ + @Column(name = "TEMPLATE_DESC") + @ApiModelProperty(value = "模板描述") + private String templateDesc; + + + /** + * 审批备注 + */ + @Transient + @ApiModelProperty(value = "审批备注") + private String reason; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSendRecordRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSendRecordRepository.java new file mode 100644 index 0000000..2ea1dd5 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSendRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysSmsSendRecord; + +/** + * @Description : 短信发送记录 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-14 17:52 + * @Modify: + **/ +public interface SysSmsSendRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSignRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSignRepository.java new file mode 100644 index 0000000..0e1adaf --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSignRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysSmsSign; + +/** + * @Description : 短信签名 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-14 17:51 + * @Modify: + **/ +public interface SysSmsSignRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsTemplateRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsTemplateRepository.java new file mode 100644 index 0000000..94d50ba --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsTemplateRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysSmsTemplate; + +/** + * @Description : 短信模板 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-14 17:52 + * @Modify: + **/ +public interface SysSmsTemplateRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 694c194..b5b3a86 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 @@ -584,11 +584,11 @@ public class CoreHqlPack { DdlPreparedPack.getNumEqualPack(user.getUserStatus(), "userStatus", result); // DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); - DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); - DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result); - DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); - DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); - DdlPreparedPack.getStringLikerPack(user.getUserEmpNo(),"userEmpNo",result); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", result); + DdlPreparedPack.getStringLikerPack(user.getUserName(), "userName", result); + DdlPreparedPack.getStringLikerPack(user.getUserEmail(), "userEmail", result); + DdlPreparedPack.getStringLikerPack(user.getUserPhone(), "userPhone", result); + DdlPreparedPack.getStringLikerPack(user.getUserEmpNo(), "userEmpNo", result); // DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getInPackList(idList, "id", result); @@ -1143,66 +1143,68 @@ public class CoreHqlPack { return ddlPackBean; } - public static DdlPackBean packHqlSysTaskPlanOnly(SysTaskPlan sysTaskPlan){ + public static DdlPackBean packHqlSysTaskPlanOnly(SysTaskPlan sysTaskPlan) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysTaskPlan); - DdlPreparedPack.getNumEqualPack(sysTaskPlan.getId(),"id",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysTaskPlan.getName(),"name",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysTaskPlan.getGroupName(),"groupName",ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysTaskPlan.getName(), "name", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysTaskPlan.getGroupName(), "groupName", ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlSysUserCustomizeConfigOnly(SysUserCustomizeConfig sysUserCustomizeConfig){ + + public static DdlPackBean packHqlSysUserCustomizeConfigOnly(SysUserCustomizeConfig sysUserCustomizeConfig) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig); - DdlPreparedPack.getNumNOEqualPack(sysUserCustomizeConfig.getId(),"id",ddlPackBean); - DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(),"userId",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(),"configKey",ddlPackBean); - DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(),"customizeConfigType",ddlPackBean); + DdlPreparedPack.getNumNOEqualPack(sysUserCustomizeConfig.getId(), "id", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(), "userId", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(), "configKey", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(), "customizeConfigType", ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlGetSysUserCustomizeConfig(SysUserCustomizeConfig sysUserCustomizeConfig){ + public static DdlPackBean packHqlGetSysUserCustomizeConfig(SysUserCustomizeConfig sysUserCustomizeConfig) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig); - DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(),"userId",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(),"configKey",ddlPackBean); - DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(),"customizeConfigType",ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(), "userId", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(), "configKey", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(), "customizeConfigType", ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlQuerySysLogUserLogin(SysLogUserLogin sysLogUserLogin){ + public static DdlPackBean packHqlQuerySysLogUserLogin(SysLogUserLogin sysLogUserLogin) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysLogUserLogin); - DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginStatus(),"logLoginStatus",ddlPackBean); - DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginPlatform(),"logLoginPlatform",ddlPackBean); - DdlPreparedPack.getStringLikerPack(sysLogUserLogin.getLogLoginName(),"logLoginName",ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginStatus(), "logLoginStatus", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginPlatform(), "logLoginPlatform", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysLogUserLogin.getLogLoginName(), "logLoginName", ddlPackBean); DdlPreparedPack.getStringLikerPack(sysLogUserLogin.getLogLoginHost(), "logLoginHost", ddlPackBean); DdlPreparedPack.timeBuilder(sysLogUserLogin.getLogLoginDateTime(), "logLoginDateTime", ddlPackBean, false, true); return ddlPackBean; } - public static DdlPackBean packHqlFindUserIdByExternalRef(Integer externalRef,List valueList){ + public static DdlPackBean packHqlFindUserIdByExternalRef(Integer externalRef, List valueList) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(externalRef,"externalRef",ddlPackBean); - DdlPreparedPack.getInPackList(valueList,"valueList",ddlPackBean); + DdlPreparedPack.getNumEqualPack(externalRef, "externalRef", ddlPackBean); + DdlPreparedPack.getInPackList(valueList, "valueList", ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlFindExternalRefByUserId(Integer externalRef,List userIdList){ + + public static DdlPackBean packHqlFindExternalRefByUserId(Integer externalRef, List userIdList) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(externalRef,"externalRef",ddlPackBean); - DdlPreparedPack.getInPackList(userIdList,"userId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(externalRef, "externalRef", ddlPackBean); + DdlPreparedPack.getInPackList(userIdList, "userId", ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlGetSysRefUserExternal(SysRefUserExternal sysRefUserExternal){ + public static DdlPackBean packHqlGetSysRefUserExternal(SysRefUserExternal sysRefUserExternal) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysRefUserExternal); DdlPreparedPack.getNumEqualPack(sysRefUserExternal.getUserId(), "userId", ddlPackBean); @@ -1213,7 +1215,7 @@ public class CoreHqlPack { } - public static DdlPackBean packHqlQuerySysSoftUpdateRecord(SysSoftUpdateRecord sysSoftUpdateRecord){ + public static DdlPackBean packHqlQuerySysSoftUpdateRecord(SysSoftUpdateRecord sysSoftUpdateRecord) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSoftUpdateRecord); DdlPreparedPack.getNumEqualPack(sysSoftUpdateRecord.getSystemSoftType(), "systemSoftType", ddlPackBean); @@ -1224,7 +1226,7 @@ public class CoreHqlPack { return ddlPackBean; } - public static DdlPackBean packHqlCheckSysSoftUpdateRecordOnly(SysSoftUpdateRecord sysSoftUpdateRecord){ + public static DdlPackBean packHqlCheckSysSoftUpdateRecordOnly(SysSoftUpdateRecord sysSoftUpdateRecord) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSoftUpdateRecord); DdlPreparedPack.getNumNOEqualPack(sysSoftUpdateRecord.getId(), "id", ddlPackBean); @@ -1235,20 +1237,105 @@ public class CoreHqlPack { } - public static DdlPackBean packHqlCheckSysDepartmentOnly(SysDepartment sysDepartment){ + public static DdlPackBean packHqlCheckSysDepartmentOnly(SysDepartment sysDepartment) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysDepartment); DdlPreparedPack.getNumNOEqualPack(sysDepartment.getId(), "id", ddlPackBean); - DdlPreparedPack.getNumEqualPack(sysDepartment.getDepartmentCode(), "departmentCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysDepartment.getDepartmentCode(), "departmentCode", ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlCheckSysOrganizeOnly(SysOrganize sysOrganize){ + public static DdlPackBean packHqlCheckSysOrganizeOnly(SysOrganize sysOrganize) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysOrganize); DdlPreparedPack.getNumNOEqualPack(sysOrganize.getId(), "id", ddlPackBean); - DdlPreparedPack.getNumEqualPack(sysOrganize.getOrganizeCode(), "organizeCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysOrganize.getOrganizeCode(), "organizeCode", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装检查短信签名唯一hql + * + * @param sysSmsSign 短信签名信息 + * @return 封装信息 + */ + public static DdlPackBean packHqlCheckSysSmsSignOnly(SysSmsSign sysSmsSign) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsSign); + + DdlPreparedPack.getNumNOEqualPack(sysSmsSign.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysSmsSign.getSignCode(), "signCode", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装短信签名查询hql + * + * @param sysSmsSign 短信签名信息 + * @return 封装信息 + */ + public static DdlPackBean packHqlFindSysSmsSign(SysSmsSign sysSmsSign) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsSign); + + DdlPreparedPack.getStringLikerPack(sysSmsSign.getSignCode(), "signCode", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsSign.getSignName(), "signName", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装检查短信模板唯一hql + * + * @param sysSmsTemplate 短信模板信息 + * @return 封装信息 + */ + public static DdlPackBean packHqlCheckSysSmsTemplateOnly(SysSmsTemplate sysSmsTemplate) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsTemplate); + + DdlPreparedPack.getNumNOEqualPack(sysSmsTemplate.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysSmsTemplate.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysSmsTemplate.getTemplateName(), "templateName", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateType(), "templateType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateStatus(), "templateStatus", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装短信模板查询hql + * + * @param sysSmsTemplate 短信模板信息 + * @return 封装信息 + */ + public static DdlPackBean packHqlFindSysSmsTemplate(SysSmsTemplate sysSmsTemplate) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsTemplate); + + DdlPreparedPack.getStringLikerPack(sysSmsTemplate.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsTemplate.getTemplateName(), "templateName", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateType(), "templateType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateStatus(), "templateStatus", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装短信发送记录查询hql + * + * @param sysSmsSendRecord 短信发送记录 + * @return 封装信息 + */ + public static DdlPackBean packHqlFindSysSmsSendRecord(SysSmsSendRecord sysSmsSendRecord) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsSendRecord); + + DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getTemplateName(), "templateName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getReceivePhoneNumber(), "receivePhoneNumber", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getBizId(), "bizId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsSendRecord.getSoftType(), "softType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsSendRecord.getSmsSendStatus(), "smsSendStatus", ddlPackBean); + DdlPreparedPack.timeBuilder(sysSmsSendRecord.getSendDateTime(), "smsSendStatus", ddlPackBean,false,true); return ddlPackBean; } From 7880fc96c9ea90e57038ab30e4d6b916760e3758 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 25 Dec 2020 20:30:43 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 1861799..58c5249 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; 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.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; @@ -156,6 +156,19 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("行号") private String item; + + @ApiParam("应盘人") + public String detailsCreateUser; + + @ApiParam("应盘时间") + public String detailsCreateDatetime; + + @ApiParam("实盘人") + public String factCreateUser; + + @ApiParam("实盘时间") + public String factCreateDatetime; + public WmsCSFactTrans(){} public Integer getIsScopeVal() {