alwaysfrin 7 years ago
commit 24df1f406a

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

@ -703,19 +703,17 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PART_ABC {
A(1, "A", "正常"),
B(2, "B", "正常"),
C(3, "C", "取消"),
D(4, "D", "取消"),
E(5, "E", "取消");
A(1, "A"),
B(2, "B"),
C(3, "C"),
D(4, "D"),
E(5, "E");
private int value;
private String code;
private String description;
PART_ABC(int value, String code, String description) {
PART_ABC(int value, String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -727,10 +725,6 @@ public class WmsEnumUtil {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -1166,7 +1160,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CS_ITEM_STATUS {
CREATE(1, "创建"),FINISH(10, "已");
CREATE(1, "创建"),FINISH(10, "已处理");
private int value;
private String description;

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

@ -20,19 +20,27 @@ import javax.persistence.Table;
@Data
@Entity
@EqualsAndHashCode(callSuper = true)
@Table(name="sys_locale_language")
@Table(name="SYS_LOCALE_LANGUAGE")
@Api(value="系统语言表",description = "对系统语言进行匹配。")
public class SysLocaleLanguage extends BaseBean {
@Column(name="language_name")
@Column(name="LANGUAGE_NAME")
@ApiParam(value = "语言名称",example = "前台显示的名称")
private String languageName;
@Column(name="language_code")
@Column(name="LANGUAGE_CODE")
@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="is_default")
@ApiParam(value = "是否默认",example = "1")
@Column(name="LANGUAGE_SORT")
@ApiParam(value ="排序" , example ="1")
private Integer languageSort;
@Column(name="IS_DEFAULT")
@ApiParam(value = "是否默认",example = "2")
private Integer isDefault;
@Column(name = "LANGUAGE_STATUS")
@ApiParam(value = "语言状态",example = "1")
private Integer languageStatus;
}

@ -60,5 +60,5 @@ public class SysLocaleResource extends BaseBean {
//系统自带需要有初始化表只能修改value无法删除。
@Column(name="is_system")
@ApiParam(value = "是否系统参数",example = "2")
private Integer isSystem;
private Integer isSystem = 2;
}

@ -24,9 +24,9 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_EXCEPTION")
@Table(name="SYS_LOG_EXCEPTION")
@Api(value="系统异常表",description = "记录系统出现的异常")
public class SysException extends BaseBean {
public class SysLogException extends BaseBean {
//CommonEnumUtil.SOFT_TYPE
@Column(name="EXC_MODULE_ID")

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

@ -118,6 +118,12 @@ public class SysUserInfo extends BaseBean {
@ApiParam(value ="用户所有岗位信息")
private transient List<SysPosition> positionList;
@ApiParam(value ="用户所有组织信息")
private transient List<SysOrganize> organizeList;
@ApiParam(value ="用户岗位信息")
private transient SysDepartment department;
@ApiParam(value ="用户组织信息")
private transient SysOrganize organize;

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

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repositorymongo;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysException;
import cn.estsh.i3plus.pojo.platform.bean.SysLogException;
/**
* @Description : (使Mongodb)
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.SysException;
* @Date : 2018-11-8 12:03:00
* @Modify :
**/
public interface SysExceptionRepository extends BaseMongoRepository<SysException, Long> {
public interface SysLogExceptionRepository extends BaseMongoRepository<SysLogException, Long> {
}

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.platform.sqlpack;
import cn.estsh.i3plus.pojo.base.tool.BsonPackTool;
import cn.estsh.i3plus.pojo.platform.bean.SysLogException;
import cn.estsh.i3plus.pojo.platform.bean.SysLogOperate;
import cn.estsh.i3plus.pojo.platform.bean.SysLogSystem;
import com.mongodb.BasicDBObject;
@ -33,6 +34,11 @@ public class CoreBsonPack {
return bson;
}
/**
*
* @param logOperate
* @return
*/
public static Bson packBsonByLogOperate(SysLogOperate logOperate){
Bson bson = new BasicDBObject();
@ -43,4 +49,19 @@ public class CoreBsonPack {
return bson;
}
/**
*
* @param sysLogException
* @return
*/
public static Bson packBsonBySysLogException(SysLogException sysLogException){
Bson bson = new BasicDBObject();
bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(),"excModule",bson);
bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(),"excMessage",bson);
bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(),"createDatetime",bson,false,false);
return bson;
}
}

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

@ -45,7 +45,7 @@ public class WmsCSFactTrans extends BaseBean {
public String locateNo;
@Column(name="PART_NO")
@ApiParam("物料码")
@ApiParam("物料码")
public String partNo;
@Column(name="PART_NAME_RDD")

@ -45,7 +45,7 @@ public class WmsCSOrderDetails extends BaseBean {
public String locateNo;
@Column(name="PART_NO")
@ApiParam("物料码")
@ApiParam("物料码")
public String partNo;
@Column(name="PART_NAME_RDD")

@ -34,7 +34,7 @@ public class WmsMoveSn extends BaseBean {
@Column(name="ITEM")
@ApiParam("行号")
public String item;
public Integer item;
@Column(name="PART_NO")
@ApiParam("物料编码")

@ -57,7 +57,7 @@ public class WmsQCDetails extends BaseBean {
public Double factQty;
@Column(name="PASS_QTY")
@ApiParam(value = "实检数量", example = "0")
@ApiParam(value = "合格数量", example = "0")
public Double passQty;
@Column(name="REJECT_QTY")

@ -49,11 +49,11 @@ public class WmsQCTrans extends BaseBean {
@Column(name="PASS_QTY")
@ApiParam("合格数量")
public String passQty;
public double passQty;
@Column(name="REJECT_QTY")
@ApiParam("不合格数量")
public String rejectQty;
public double rejectQty;
@Column(name="UNIT")
@ApiParam("单位")

@ -7,6 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -118,6 +119,7 @@ public class WmsStockSn extends BaseBean {
@Column(name = "PDATE")
@ApiParam(value = "打印时间")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date pdate;
/**
* 1=ASN,10=PO,20=SO

@ -70,5 +70,5 @@ public class WmsTransSn extends BaseBean {
@Column(name="TRANS_NO")
@ApiParam("事务编号")
public String transNo;
public Long transNo;
}

@ -126,7 +126,7 @@ public class WmsHqlPack {
*/
public static String packHqlWmsRoutingChildren(String routingCode) {
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(routingCode, "routingCode", result);
HqlPack.getStringEqualPack(routingCode, "routingCode", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
"isDeleted", result);
@ -230,6 +230,7 @@ public class WmsHqlPack {
HqlPack.getStringEqualPack(wmsLocate.getLocateType(), "locateType", result);
HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result);
HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result);
HqlPack.getNumEqualPack(wmsLocate.getIsEmpty(), "isEmpty", result);
HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
HqlPack.getStringEqualPack(wmsLocate.getOrganizeCode(),"organizeCode",result);
@ -595,7 +596,7 @@ public class WmsHqlPack {
public static String packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result);
HqlPack.getStringLikerPack(wmsASNMasterDetails.getItem(), "item", result);
HqlPack.getStringEqualPack(wmsASNMasterDetails.getItem(), "item", result);
HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNo(), "partNo", result);
HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result);
HqlPack.getNumLikerPack(wmsASNMasterDetails.getQty(), "qty", result);
@ -613,9 +614,7 @@ public class WmsHqlPack {
HqlPack.getStringLikerPack(wmsASNMasterDetails.getErpWhNo(), "erpWhNo", result);
HqlPack.getStringLikerPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result);
//有效性
HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
getStringBuilderPack(wmsASNMasterDetails,result);
return result.toString();
}
@ -677,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);
// 打印机
@ -820,10 +819,10 @@ public class WmsHqlPack {
* @param tranNo
* @return
*/
public static String packWmsTransSn(String tranNo) {
public static String packWmsTransSn(Long tranNo) {
StringBuffer result = new StringBuffer();
//查询参数封装
HqlPack.getStringEqualPack(tranNo, "tranNo", result);
HqlPack.getNumEqualPack(tranNo, "transNo", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result.toString();
}
@ -1020,6 +1019,7 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
//查询参数封装
HqlPack.getStringLikerPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result);
getStringBuilderPack(wmsCSOrderDetails, result);
return result.toString();
@ -1035,6 +1035,7 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
//查询参数封装
HqlPack.getStringLikerPack(wmsCSFactTrans.getOrderNo(), "orderNo", result);
getStringBuilderPack(wmsCSFactTrans, result);
return result.toString();

Loading…
Cancel
Save