amy 7 years ago
commit a1ea518108

@ -0,0 +1,76 @@
package cn.estsh.i3plus.pojo.base.enumutil;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* @Description : Model Pojo
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2018-11-21 15:50
* @Modify:
**/
public class ModelEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum COMMON_TREE_TYPE{
TYPE_ORGANIZE(1,"组织","SysOrganize"),
TYPE_DEPARTMENT(2,"部门","SysDepartment"),
;
private int value;
private String name;
private String description;
COMMON_TREE_TYPE() {
}
COMMON_TREE_TYPE(int value, String name, String description) {
this.value = value;
this.name = name;
this.description = description;
}
public int getValue() {
return value;
}
public String getName() {
return name;
}
public String getDescription() {
return description;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].name;
}
}
return tmp;
}
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 String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].name.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

@ -0,0 +1,23 @@
package cn.estsh.i3plus.pojo.model.platform;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @Description : Tree
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2018-11-21 15:50
* @Modify:
**/
@Data
public class CommonTreeModel {
private BaseBean bean;
private Integer beanType;
private List<CommonTreeModel> childList = new ArrayList<>();
}

@ -32,6 +32,10 @@ public class SysLocaleLanguage extends BaseBean {
@ApiParam(value = "语言代码",example = "使用浏览器语言代码参考java.util.Locale中的代码。CN/zhTW/zhHK/zhUS/en, FR/en,GB/en,JP/en,DE/en,KR/en")
private String languageCode;
@Column(name="LANGUAGE_SORT")
@ApiParam(value ="排序" , example ="1")
private Integer languageSort;
@Column(name="IS_DEFAULT")
@ApiParam(value = "是否默认",example = "2")
private Integer isDefault;

@ -0,0 +1,71 @@
package cn.estsh.i3plus.pojo.platform.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.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2018-11-21 15:12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_NUMBER_RULE")
@Api(value="单号规则",description = "单号规则")
public class SysOrderNoRule extends BaseBean {
@Column(name = "NAME")
@ApiParam(value = "规则名称")
private String name;
@Column(name = "ORDER_NO_RULE_CODE")
@ApiParam(value = "规则代码")
private String orderNoRuleCode;
@Column(name = "numberRule")
@ApiParam(value = "单号规则")
private String orderNoRule;
@Column(name = "SERIAL_NO_SEED")
@ApiParam(value = "流水号种子",example = "-1")
private Integer serialNoSeed;
@Column(name = "ORDER_NO_INCREMENT")
@ApiParam(value = "流水号步长",example = "-1")
private Integer serialNoIncrement;
@Column(name = "SERIAL_NO_LENGTH")
@ApiParam(value = "流水号长度",example = "-1")
private Integer serialNoLength;
@Column(name = "IS_CYCLE")
@ApiParam(value = "达到最大值后是否循环",example = "1")
private Integer isCycle;
@Column(name = "LAST_MAKE_SERIAL_NO")
@ApiParam(value = "上次新增流水号",example = "-1")
private Integer lastMakeSerialNo;
@Column(name = "LAST_MAKE_ORDER_NO")
@ApiParam(value = "上次新增单号")
private String lastMakeOrderNo;
@Column(name = "LAST_MAKE_DATE")
@ApiParam(value = "上次新增时间")
private String lastMakeDatetime;
}

@ -68,4 +68,5 @@ public class SysOrganize extends BaseBean {
@ApiParam(value ="子集列表")
private transient List<SysOrganize> childList;
}

@ -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.SysOrderNoRule;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2018-11-21 17:15
* @Modify:
**/
public interface SysOrderNoRuleRepository extends BaseRepository<SysOrderNoRule,Long> {
}

@ -5,8 +5,6 @@ import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.platform.bean.*;
import org.apache.commons.lang3.StringUtils;
import java.util.Arrays;
/**
* @Description :
* @Reference :
@ -125,6 +123,7 @@ public class CoreHqlPack {
// 查询参数封装
HqlPack.getNumEqualPack(department.getParentId(),"parentId",result);
HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result);
HqlPack.getStringLikerPack(department.getName(),"name",result);
HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result);
@ -174,7 +173,7 @@ public class CoreHqlPack {
// hql拼接
HqlPack.getStringLikerPack(config.getName(),"name",result);
HqlPack.getStringLikerPack(config.getConfigCode(),"configCode",result);
HqlPack.getNumEqualPack(config.getConfigType(),"configTypeId",result);
HqlPack.getNumEqualPack(config.getConfigType(),"configType",result);
return result.toString();
}
@ -346,6 +345,7 @@ public class CoreHqlPack {
StringBuffer result = new StringBuffer();
// And
HqlPack.getNumEqualPack(userInfo.getOrganizeId(),"organizeId",result);
HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result);
HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result);
HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
@ -385,4 +385,34 @@ public class CoreHqlPack {
return result.toString();
}
/**
*
* @param sysOrderNoRule
* @return
*/
public static String packHqlSysOrderNoRuleCode(SysOrderNoRule sysOrderNoRule){
StringBuffer result = new StringBuffer();
// and
HqlPack.getStringEqualPack(sysOrderNoRule.getOrderNoRuleCode(),"dictionaryCode",result);
// not
HqlPack.getNumNOEqualPack(sysOrderNoRule.getId(),"id",result);
return result.toString();
}
/**
*
* @param sysOrderNoRule
* @return
*/
public static String packHqlSysOrderNoRule(SysOrderNoRule sysOrderNoRule){
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(sysOrderNoRule.getName(),"name",result);
HqlPack.getStringLikerPack(sysOrderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
return result.toString();
}
}

@ -676,7 +676,7 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
// 来源单据类型
HqlPack.getStringLikerPack(wmsSnPrint.getRefType(), "refType", result);
HqlPack.getStringEqualPack(wmsSnPrint.getRefType(), "refType", result);
// 来源单据号
HqlPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result);
// 打印机

Loading…
Cancel
Save