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

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

Browse Source
yun-zuoyi
Silliter 6 years ago
parent a4bc8ec6ca 96f003f4a5
commit 4c0116b082
17 changed files with 427 additions and 63 deletions
Show Stats Download Patch File Download Diff File

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

@ -1813,4 +1813,111 @@ public class BlockFormEnumUtil {
}
}
/**
* 数据状态
* 1 启用
* 2 禁用
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_STATUS {
ENABLE(1, "启用", "fa fa-success cell-fa fa-check"),
DISABLE(2, "禁用", "fa fa-disabled cell-fa fa-times-circle");
private int value;
private String name;
private String description;
DATA_STATUS() {
}
DATA_STATUS(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 String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].getName();
}
}
return tmp;
}
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;
}
}
/**
* 按钮位置类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BUTTON_POSITION_TYPE {
FORM_METHOD(1, "FORM_METHOD", "表单功能"),
FORM_METHOD_DETAIL(2, "FORM_ETHOD_DETAIL", "表单功能明细");
private int value;
private String name;
private String description;
BUTTON_POSITION_TYPE(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 BUTTON_POSITION_TYPE valueOf(int val) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
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;
}
}
}

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

@ -423,12 +423,14 @@ public class ImppEnumUtil {
* 用户消息类型
* 1.NOTICE：通知
* 2.STATION_LETTER：站内信
* 3.SWEB_NOTICE：SWEB通知
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MESSAGE_TYPE {
MAIL(1,"邮件","邮件"),
LETTER(2,"站内信","站内信");
LETTER(2,"站内信","站内信"),
SWEB_NOTICE(3,"SWEB通知","SWEB通知");
private int value;
private String name;

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

@ -60,4 +60,8 @@ public class BfButton extends BaseBean {
@Column(name = "METHOD_CONTENT")
@ApiParam(value = "执行内容")
private String methodContent;
@Column(name = "BUTTON_DESCRIPTION")
@ApiParam(value = "按钮描述")
private String buttonDescription;
}

5
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java
Unescape Escape View File

@ -55,6 +55,7 @@ public class BfMenu extends BaseBean {
@ApiParam(value ="菜单样式")
private String menuStyle;
//
@Column(name="MENU_TYPE")
@ApiParam(value ="菜单类型")
private Integer menuType;
@ -68,6 +69,10 @@ public class BfMenu extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long methodId;
@Column(name="METHOD_NAME_RDD")
@ApiParam(value ="功能名称")
private String methodNameRdd;
@Column(name = "MENU_STATUS")
@ApiParam(value = "菜单状态")
private Integer menuStatus;

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

@ -35,6 +35,10 @@ public class BfMethodDetail extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long methodId;
@Column(name="METHOD_NAME_RDD")
@ApiParam(value ="功能名称")
private String methodNameRdd;
@Column(name="layout_column_id")
@ApiParam(value ="布局列id")
@JsonSerialize(using = ToStringSerializer.class)

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

@ -38,6 +38,10 @@ public class BfRefMethodRole extends BaseBean {
@ApiParam(value = "表单功能名称")
private String methodNameRdd;
@Column(name = "METHOD_LAYOUT_NAME_RDD")
@ApiParam(value = "功能布局名称")
private String methodLayoutNameRdd;
@Column(name = "ROLE_ID")
@ApiParam(value = "角色id")
@JsonSerialize(using = ToStringSerializer.class)

94
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
Unescape Escape View File

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.form.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.form.bean.*;
@ -124,15 +125,16 @@ public final class FormHqlPack {
* @param bfMenu 菜单目录
* @return hql
*/
public static String packHqlBfMenu(BfMenu bfMenu) {
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlBfMenu(BfMenu bfMenu) {
DdlPackBean result = new DdlPackBean();
HqlPack.getStringLikerPack(bfMenu.getMenuName(), "menuName", result);
HqlPack.getNumEqualPack(bfMenu.getParentId(), "parentId", result);
HqlPack.getNumEqualPack(bfMenu.getIsDeleted(), "isDeleted", result);
result.append(bfMenu.orderBy());
DdlPreparedPack.getStringLikerPack(bfMenu.getMenuName(), "menuName", result);
DdlPreparedPack.getNumEqualPack(bfMenu.getParentId(), "parentId", result);
DdlPreparedPack.getNumEqualPack(bfMenu.getMenuStatus(), "menuStatus", result);
DdlPreparedPack.getNumEqualPack(bfMenu.getIsDeleted(), "isDeleted", result);
result.setOrderByStr(bfMenu.orderBy());
return result.toString();
return result;
}
/**
@ -152,6 +154,22 @@ public final class FormHqlPack {
}
/**
* 表单功能明细复杂查询
* @param bfMethodDetail 表单功能明细查询条件
* @return hql
*/
public static DdlPackBean packHqlBfMethodDetail(BfMethodDetail bfMethodDetail) {
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(bfMethodDetail.getMethodDetailName(), "methodDetailName", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfMethodDetail.getMethodId(), "layoutId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfMethodDetail.getIsDeleted(), "isDeleted", ddlPackBean);
ddlPackBean.setOrderByStr(bfMethodDetail.orderBy());
return ddlPackBean;
}
/**
* 表单拦截器复杂查询
* @param bfIntercept 查询条件
* @return hql
@ -170,15 +188,63 @@ public final class FormHqlPack {
/**
* 表单按钮复杂查询
* @param bfButton 查询条件
* @return 查询条件
*/
public static String packHqlBfButton(BfButton bfButton){
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlBfButton(BfButton bfButton){
DdlPackBean ddlPackBean = new DdlPackBean();
HqlPack.getStringLikerPack(bfButton.getButtonName(), "buttonName", result);
HqlPack.getNumEqualPack(bfButton.getTriggerMode(), "triggerMode", result);
HqlPack.getNumEqualPack(bfButton.getIsDeleted(), "isDeleted", result);
result.append(bfButton.orderBy());
DdlPreparedPack.getStringLikerPack(bfButton.getButtonName(), "buttonName", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfButton.getTriggerMode(), "triggerMode", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfButton.getIsDeleted(), "isDeleted", ddlPackBean);
ddlPackBean.setOrderByStr(bfButton.orderBy());
return result.toString();
return ddlPackBean;
}
/**
* 根据角色id查询关联功能
* @param roleIds 角色id
* @return 查询条件
*/
public static DdlPackBean packHqlBfRefMethodRoleByRoleIds(Long[] roleIds){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getInPackArray(roleIds, "roleId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean);
return ddlPackBean;
}
/**
* 按钮功能关系数据查询条件
* @param bfRefButtonMethod 查询条件
* @return DdlPackBean
*/
public static DdlPackBean packHqlBfRefButtonMethod(BfRefButtonMethod bfRefButtonMethod) {
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonId(), "buttonId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonPositionType(), "buttonPositionType", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfRefButtonMethod.getButtonPositionRefId(), "buttonPositionRefId", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfRefButtonMethod.getButtonNameRdd(), "buttonNameRdd", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfRefButtonMethod.getButtonPositionRefNameRdd(), "buttonPositionRefNameRdd", ddlPackBean);
ddlPackBean.setOrderByStr(bfRefButtonMethod.orderBy());
return ddlPackBean;
}
/**
* 功能权限数据查询条件
* @param bfRefMethodRole 查询条件
* @return DdlPackBean
*/
public static DdlPackBean packHqlBfRefMethodRole(BfRefMethodRole bfRefMethodRole) {
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(bfRefMethodRole.getMethodId(), "methodId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bfRefMethodRole.getRoleId(), "roleId", ddlPackBean);
ddlPackBean.setOrderByStr(bfRefMethodRole.orderBy());
return ddlPackBean;
}
}

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

@ -0,0 +1,58 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
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.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 文件附件
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-04-11 16:01
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_FILE_ATTACH")
@Api(value="文件附件",description = "文件附件")
public class SysFileAttachment extends BaseBean {
@Column(name="ATTACH_SOFT_TYPE")
@ApiParam(value ="附件所属模块")
private Integer attachSoftType;
@Column(name="ATTACH_SOURCE")
@ApiParam(value ="附件来源")
private Integer attachSource;
@Column(name="REF_ID")
@ApiParam(value ="关联id")
@JsonSerialize(using = ToStringSerializer.class)
private Long refId;
@Column(name="FILE_ID")
@ApiParam(value ="文件id")
@JsonSerialize(using = ToStringSerializer.class)
private Long fileId;
@Column(name="FILE_NAME_RDD")
@ApiParam(value ="文件名称冗余")
private String fileNameRdd;
@Column(name="FILE_PATH_RDD")
@ApiParam(value ="文件路径冗余")
private String filePathRdd;
}

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -9,73 +10,130 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Subselect;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description : 系统消息
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 16:58:43.689
* @Modify :
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 16:58:43.689
* @Modify :
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_MESSAGE")
@Api(value="系统消息",description = "系统消息")
@Table(name = "SYS_MESSAGE")
@Api(value = "系统消息", description = "系统消息")
public class SysMessage extends BaseBean {
@Column(name="MESSAGE_TITLE")
@ApiParam(value ="消息标题" , access ="消息标题")
@Column(name = "MESSAGE_TITLE")
@ApiParam(value = "消息标题", access = "消息标题")
private String messageTitle;
@Column(name="MESSAGE_TYPE")
@ApiParam(value ="消息类型(枚举：ImppEnumUtil.MESSAGE_TYPE)" , example ="-1")
@Column(name = "MESSAGE_SOFT_TYPE")
@ApiParam(value = "消息所属模块")
private Integer messageSoftType;
@Column(name = "MESSAGE_TYPE")
@ApiParam(value = "消息类型(枚举：ImppEnumUtil.MESSAGE_TYPE)", example = "-1")
private Integer messageType;
@Column(name="MESSAGE_TYPE_CONTENT")
@ApiParam(value ="消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)" , example ="-1")
public int getMessageTypeValue() {
if(this.messageType == null){
return ImppEnumUtil.MESSAGE_TYPE.LETTER.getValue();
} else {
return this.messageType.intValue();
}
}
@Column(name = "MESSAGE_TYPE_CONTENT")
@ApiParam(value = "消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)", example = "-1")
private Integer messageContentType;
@Column(name="MESSAGE_CONTENT",columnDefinition = "TEXT")
@ApiParam(value ="消息内容" , access ="消息内容")
@Column(name = "MESSAGE_CONTENT", columnDefinition = "TEXT")
@ApiParam(value = "消息内容", access = "消息内容")
private String messageContent;
@Column(name="MESSAGE_SENDER_ID")
@ApiParam(value ="发送者id" , example = "-1")
@Column(name = "MESSAGE_SENDER_ID")
@ApiParam(value = "发送者id", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long messageSenderId;
@Column(name="MESSAGE_SENDER_NAME_RDD")
@ApiParam(value ="发送者名称" )
@Column(name = "MESSAGE_SENDER_NAME_RDD")
@ApiParam(value = "发送者名称")
private String messageSenderNameRdd;
@Column(name="MESSAGE_RECEIVER_TYPE")
@ApiParam(value ="收件人类型(枚举：ImppEnumUtil.MESSAGE_TYPE)" , example ="-1")
@Column(name = "MESSAGE_RECEIVER_TYPE")
@ApiParam(value = "收件人类型(枚举：ImppEnumUtil.MESSAGE_TYPE)", example = "-1")
private Integer messageReceiverType;
@Column(name="MESSAGE_RECEIVERS_ID")
@ApiParam(value ="收件者id" )
@Column(name = "MESSAGE_RECEIVERS_ID")
@ApiParam(value = "收件者id")
private String messageReceiversId;
@Column(name="MESSAGE_RECEIVERS_NAME_RDD")
@ApiParam(value ="接受者名称集合" )
@Column(name = "MESSAGE_RECEIVERS_NAME_RDD")
@ApiParam(value = "接受者名称集合")
private String messageReceiversNameRdd;
@Column(name="MESSAGE_SEND_TIME")
@ApiParam(value ="发送时间" )
@Column(name = "MESSAGE_SEND_TIME")
@ApiParam(value = "发送时间")
private String messageSendTime;
@Column(name="IS_URGENT")
@ApiParam(value ="是否紧急")
@Column(name = "IS_URGENT")
@ApiParam(value = "是否紧急")
private Integer isUrgent;
@Column(name="IS_SYSTEM")
@ApiParam(value ="是否系统邮件")
@Column(name = "IS_SYSTEM")
@ApiParam(value = "是否系统邮件")
private Integer isSystem;
@Transient
@ApiParam(value = "阅读统计")
@JsonSerialize(using = ToStringSerializer.class)
private Long readCount;
public SysMessage() {
}
public SysMessage(
Long id, String messageTitle, Integer messageSoftType, Integer messageType, Integer messageContentType,
String messageContent, Long messageSenderId, String messageSenderNameRdd, Integer messageReceiverType,
String messageReceiversId, String messageReceiversNameRdd, String messageSendTime, Integer isUrgent,
Integer isSystem, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
String modifyUser, String modifyDatetime, Long readCount) {
this.id = id;
this.messageTitle = messageTitle;
this.messageSoftType = messageSoftType;
this.messageType = messageType;
this.messageContentType = messageContentType;
this.messageContent = messageContent;
this.messageSenderId = messageSenderId;
this.messageSenderNameRdd = messageSenderNameRdd;
this.messageReceiverType = messageReceiverType;
this.messageReceiversId = messageReceiversId;
this.messageReceiversNameRdd = messageReceiversNameRdd;
this.messageSendTime = messageSendTime;
this.isUrgent = isUrgent;
this.isSystem = isSystem;
this.readCount = readCount;
this.isValid = isValid;
this.isDeleted = isDeleted;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
}
@Transient
@ApiParam(value = "附件集合")
private List<SysFileAttachment> sysFileAttachmentList;
}

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -39,6 +40,10 @@ public class SysRefUserMessage extends BaseBean {
@ApiParam(value ="冗余消息标题")
private String messageTitleRdd;
@Column(name="MESSAGE_SOFT_TYPE")
@ApiParam(value ="消息所属模块")
private Integer messageSoftType;
@Column(name="MESSAGE_TYPE_RDD")
@ApiParam(value ="冗余消息类型")
private Integer messageTypeRdd;
@ -67,4 +72,12 @@ public class SysRefUserMessage extends BaseBean {
@Column(name="MESSAGE_STATUS")
@ApiParam(value = "消息状态")
private Integer messageStatus;
public int getMessageStatusValue() {
if(this.messageStatus == null){
return ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue();
} else {
return messageStatus.intValue();
}
}
}

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

@ -292,22 +292,26 @@ public class CoreHqlPack {
* @param message
* @return
*/
public static String packHqlSysMessage(SysMessage message){
StringBuffer result = new StringBuffer();
public static DdlPackBean packHqlSysMessage(SysMessage message){
DdlPackBean ddlPackBean = new DdlPackBean();
// hql拼接
HqlPack.getStringLikerPack(message.getMessageTitle(),"messageTitle",result);
HqlPack.getStringLikerPack(message.getMessageContent(),"messageContent",result);
HqlPack.getNumEqualPack(message.getMessageType(),"messageType",result);
HqlPack.getStringLikerPack(message.getMessageSenderNameRdd(),"messageSenderNameRdd",result);
HqlPack.getStringLikerPack(message.getMessageReceiversNameRdd(),"messageReceiversNameRdd",result);
HqlPack.timeBuilder(message.getMessageSendTime(),"messageSendTime", result, false,false);
HqlPack.getNumEqualPack(message.getMessageSenderId(),"messageSenderId",result);
// 添加默认排序
HqlPack.getOrderDefault(message);
return result.toString();
DdlPreparedPack.getStringLikerPack(message.getMessageTitle(), "messageTitle", ddlPackBean);
DdlPreparedPack.getStringLikerPack(message.getMessageContent(), "messageContent", ddlPackBean);
DdlPreparedPack.getNumEqualPack(message.getMessageType(), "messageType", ddlPackBean);
DdlPreparedPack.getStringLikerPack(message.getMessageSenderNameRdd(), "messageSenderNameRdd",
ddlPackBean);
DdlPreparedPack.getStringLikerPack(message.getMessageReceiversNameRdd(), "messageReceiversNameRdd",
ddlPackBean);
DdlPreparedPack.timeBuilder(message.getMessageSendTime(), "messageSendTime", ddlPackBean,
false, false);
DdlPreparedPack.getNumEqualPack(message.getMessageSenderId(), "messageSenderId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(message.getIsUrgent(), "isUrgent", ddlPackBean);
DdlPreparedPack.getNumEqualPack(message.getMessageSoftType(), "messageSoftType", ddlPackBean);
ddlPackBean.setOrderByStr(message.orderBy());
return ddlPackBean;
}
/**

2
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java
Unescape Escape View File

@ -80,7 +80,7 @@ public class SwebPurchaseOrderSn extends BaseBean {
@Column(name = "CHECK_CODE")
@ApiParam(value = "检验编号")
public String CHECK_CODE;
public String checkCode;
@Column(name = "STOVE_NO")
@ApiParam(value = "炉批号")

31
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java
Unescape Escape View File

@ -0,0 +1,31 @@
package cn.estsh.i3plus.pojo.sweb.modelbean;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.io.Serializable;
/**
* @Description : 供应商登录用户模型
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-04-12 13:13
* @Modify:
**/
@Data
@AllArgsConstructor
public class SwebLoginUserModel implements Serializable {
@ApiParam(value = "用户名")
private String userName;
@ApiParam(value = "密码")
private String password;
@ApiParam(value = "获取图片密码的唯一凭证")
private String uniqueId;
@ApiParam(value = "ip地址")
private String ip;
}

2
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java
Unescape Escape View File

@ -20,7 +20,7 @@ public class SwebPOForPubListResultItemModel extends BaseBean {
@Column(name = "ORDER_NO")
@ApiParam("单据号")
public String orderNo;
private String orderNo;
@Column(name = "PART_NO")
@ApiParam(value = "零件号")

4
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java
Unescape Escape View File

@ -18,8 +18,8 @@ import java.util.List;
public class SwebPOForPubListResultModel extends BaseBean {
@ApiParam(value = "拆分请求时间数量列表", example = "1")
public List<String> reqTimeList;
private List<String> reqTimeList;
@ApiParam(value = "分页列表", example = "1")
public ListPager<SwebPOForPubListResultItemModel> pageList;
private ListPager<SwebPOForPubListResultItemModel> pageList;
}

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

@ -160,6 +160,10 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam("前端表格编辑使用")
private Boolean isSet = false;
public String getRecommondLot() {
return recommondLot == null ? "无" : this.recommondLot;
}
public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); }
public Double getOutQty() {return outQty == null ? 0L : this.outQty.doubleValue(); }
@ -167,4 +171,6 @@ public class WmsDocMovementDetails extends BaseBean {
public Double getPickQty() {return pickQty == null ? 0L : this.pickQty.doubleValue(); }
public Double getActualQty() {return actualQty == null ? 0L : this.actualQty.doubleValue(); }
}

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

@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -28,6 +29,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_DOC_MOVEMENT_MASTER")
@Api("移库单表")
@ToString
public class WmsDocMovementMaster extends BaseBean {
@Column(name = "ORDER_NO")
@ApiParam(value = "移库单单号")

Write Preview
Loading…
Cancel
Save