I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
yun-zuoyi
钮海涛 4 years ago
parent 56630ccb0d 7880fc96c9
commit 70b80068c2
17 changed files with 701 additions and 107 deletions
Show Stats Download Patch File Download Diff File

165
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
Unescape Escape View File

@ -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;
}
}
}

1
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
Unescape Escape View File

@ -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, "工位重做"),

12
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -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 列名

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
Unescape Escape View File

@ -203,6 +203,10 @@ public class MesPackage extends BaseBean implements Serializable {
@ApiParam(value = "生产线名称")
private String workCenterName;
@Transient
@ApiParam("工序名称")
private String processName;
public MesPackage() {
}

52
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java
Unescape Escape View File

@ -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;
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java
Unescape Escape View File

@ -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<MesWorkCellJumpRecord, Long> {
}

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -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;

38
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppSmsContent.java
Unescape Escape View File

@ -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<String, Object> paramMap;
}

128
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java
Unescape Escape View File

@ -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;
}

54
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSign.java
Unescape Escape View File

@ -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;
}

101
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java
Unescape Escape View File

@ -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;
}

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSendRecordRepository.java
Unescape Escape View File

@ -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<SysSmsSendRecord, Long> {
}

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSignRepository.java
Unescape Escape View File

@ -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<SysSmsSign, Long> {
}

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsTemplateRepository.java
Unescape Escape View File

@ -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<SysSmsTemplate, Long> {
}

91
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

@ -1152,6 +1152,7 @@ public class CoreHqlPack {
return ddlPackBean;
}
public static DdlPackBean packHqlSysUserCustomizeConfigOnly(SysUserCustomizeConfig sysUserCustomizeConfig) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig);
@ -1193,6 +1194,7 @@ public class CoreHqlPack {
return ddlPackBean;
}
public static DdlPackBean packHqlFindExternalRefByUserId(Integer externalRef, List<Long> userIdList) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
@ -1239,7 +1241,7 @@ public class CoreHqlPack {
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;
}
@ -1248,7 +1250,92 @@ public class CoreHqlPack {
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;
}

17
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
Unescape Escape View File

@ -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() {

18
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
Unescape Escape View File

@ -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;
}
}

Write Preview
Loading…
Cancel
Save