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

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
jimmy 6 years ago
parent 8da671628c 148d808129
commit f52b3ff189
26 changed files with 668 additions and 174 deletions
Show Stats Download Patch File Download Diff File

23
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java
Unescape Escape View File

@ -1,5 +1,8 @@
package cn.estsh.i3plus.pojo.base.bean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @Description : 基础fallback类，用于处理熔断
* @Reference :
@ -8,9 +11,27 @@ package cn.estsh.i3plus.pojo.base.bean;
* @Modify:
**/
public class BaseFallBackBean {
private static final Logger LOGGER = LoggerFactory.getLogger(BaseFallBackBean.class);
// LOGGER.error("【微服出错，熔断】{}",cause.getMessage());
// LOGGER.error("【微服出错，熔断】{}",cause.getLocalizedMessage());
// LOGGER.error("【微服出错，熔断】{}",cause.getCause());
// cause.printStackTrace();
public BaseResultBean makeBaseFallBack(Throwable cause){
LOGGER.error("【熔断信息】{}",cause.getMessage());
LOGGER.error("【熔断原因】{}",cause.getCause());
return makeBaseFallBack("【微服熔断】服务暂停，请稍后再试。",cause);
}
public BaseResultBean makeBaseFallBack(String msg,Throwable cause){
LOGGER.error("【熔断信息】{}",cause.getMessage());
LOGGER.error("【熔断原因】{}",cause.getCause());
return BaseResultBean.buildBaseResultBean(false,cause.getMessage() + "，信息：" + msg);
}
public BaseResultBean makeBaseFallBack(){
return makeBaseFallBack("服务暂停");
return makeBaseFallBack("【微服熔断】服务暂停，请稍后再试。");
}
public BaseResultBean makeBaseFallBack(String msg){

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

@ -35,9 +35,9 @@ public class SnowflakeIdMaker {
private long twepoch = 1288834974657L;
private long workerIdBits = 10L;
private long workerIdBits = 5L;
private long datacenterIdBits = 5L;
private long maxWorkerId = -1L ^ (-1L << workerIdBits); //1023
private long maxWorkerId = -1L ^ (-1L << workerIdBits); //30
private long maxDatacenterId = -1L ^ (-1L << datacenterIdBits); //30
private long sequenceBits = 12L;

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

@ -958,16 +958,21 @@ public class WmsEnumUtil {
}
/**
* 库存条码表条码质量状态
* ASN单据状态 10=新建,20=收货中,30=收货完成，40=已关闭,50=已取消
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SN_QUALITY_STATUS {
NORMAL(10, "合格"), ABNORMAL(20, "不合格"), ISOLATED(30, "隔离");
public enum ASN_STATUS {
CREATE(10, "新建"),
RECEIPT(20, "收货中"),
RECEIPT_FINISH(30, "收货完成"),
CLOSED(40, "已关闭"),
CANCELLED(50, "已取消");
private int value;
private String description;
SN_QUALITY_STATUS(int value, String description) {
ASN_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
@ -991,6 +996,7 @@ public class WmsEnumUtil {
}
}
/**
* 业务表：库存条码状态
* 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
@ -1048,15 +1054,15 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_QC_STATUS {
QUALIFIED(10, "合格"),
UNQUALIFIED(20, "不合格"),
QUAEANTINE(30, "隔离");
NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离");
private int value;
private String code;
private String description;
STOCK_SN_QC_STATUS(int value, String description) {
STOCK_SN_QC_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -1068,6 +1074,10 @@ 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++) {
@ -1087,6 +1097,15 @@ public class WmsEnumUtil {
}
return tmp;
}
public static STOCK_SN_QC_STATUS codeOf(Integer value) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
}
/**
@ -1353,7 +1372,7 @@ public class WmsEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_INFO_STATUS {
CREATE(10, "新建"),
FINISH(20, "待处理"),
FINISH(20, "处理中"),
FAIL(30, "已完成"),
CLOSE(40, "已关闭"),
CANCEL(50, "已取消");
@ -1565,6 +1584,42 @@ public class WmsEnumUtil {
}
/**
* 打印单号数据类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRINT_ORDER_TYPE {
PO(10, "PO"),
MOVEMENT(20, "MOVEMENT"),
ASN(30, "ASN");
private int value;
private String description;
PRINT_ORDER_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
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].description;
}
}
return tmp;
}
}
/**
* 组件统一返回提示
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -2016,9 +2071,6 @@ public class WmsEnumUtil {
/**
* 数据状态
* 1 启用
* 2 禁用
* 3 全部
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_STATUS {
@ -2027,20 +2079,20 @@ public class WmsEnumUtil {
LOCKING(3, "全部", "fa cell-fa fa-lock");
private int value;
private String code;
private String description;
private String code;
DATA_STATUS(int value, String code, String description) {
DATA_STATUS(int value, String code, String description){
this.value = value;
this.code = code;
this.description = description;
this.code = code;
}
public int getValue() {
public int getValue () {
return value;
}
public String getDescription() {
public String getDescription () {
return description;
}
@ -2048,11 +2100,11 @@ public class WmsEnumUtil {
return code;
}
public static String valueOf(int val) {
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].getCode();
tmp = values()[i].getDescription();
}
}
return tmp;

238
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
Unescape Escape View File

@ -261,10 +261,14 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> listPager(Pager pager) {
return entityManager.createQuery("from " + persistentClass.getName())
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
.getResultList();
if(pager.getTotalRows() > 0) {
return entityManager.createQuery("from " + persistentClass.getName())
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
.getResultList();
}else{
return new ArrayList<T>();
}
}
@Override
@ -474,41 +478,49 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findByPropertyPage(String propertyName, Object value, String orderByStuff, Pager pager) {
String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName + " " + orderByStuff;
return entityManager.createQuery(queryString)
.setParameter(propertyName, value)
.getResultList();
if(pager.getTotalRows() > 0){
String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName + " " + orderByStuff;
return entityManager.createQuery(queryString)
.setParameter(propertyName, value)
.getResultList();
}else{
return new ArrayList<T>();
}
}
@Override
public List<T> findByPropertyPage(String[] propertyNames, Object[] values, String orderByStuff, Pager pager) {
if(propertyNames.length != values.length){
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
StringBuffer queryString = new StringBuffer();
queryString.append("from " + persistentClass.getSimpleName() + " as model ");
if(pager.getTotalRows() > 0){
if(propertyNames.length != values.length){
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
StringBuffer queryString = new StringBuffer();
queryString.append("from " + persistentClass.getSimpleName() + " as model ");
int size = propertyNames.length;
if (size > 0) {
queryString.append("where 1=1 ");
}
int size = propertyNames.length;
if (size > 0) {
queryString.append("where 1=1 ");
}
for (int i = 0; i < size; i++) {
if(values[i] != null) {
queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]);
for (int i = 0; i < size; i++) {
if(values[i] != null) {
queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]);
}
}
}
if(orderByStuff != null && orderByStuff.length() > 0){
queryString.append(orderByStuff);
}
if(orderByStuff != null && orderByStuff.length() > 0){
queryString.append(orderByStuff);
}
Query queryObject = entityManager.createQuery(queryString.toString());
for (int i = 0; i < size; i++) {
queryObject.setParameter(propertyNames[i], values[i]);
}
Query queryObject = entityManager.createQuery(queryString.toString());
for (int i = 0; i < size; i++) {
queryObject.setParameter(propertyNames[i], values[i]);
}
return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
}else{
return new ArrayList<T>();
}
}
@Override
@ -594,47 +606,55 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findByHqlWherePage(String hqlWhere, Pager pager, String[] propertyNames, Object[] values, String orderByStuff) {
if(propertyNames.length != values.length){
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
StringBuffer queryString = new StringBuffer();
queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 ");
if(pager.getTotalRows() > 0){
if(propertyNames.length != values.length){
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
StringBuffer queryString = new StringBuffer();
queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 ");
if (hqlWhere != null && hqlWhere.length() > 0) {
queryString.append(hqlWhere);
}
if (hqlWhere != null && hqlWhere.length() > 0) {
queryString.append(hqlWhere);
}
int size = propertyNames.length;
for (int i = 0; i < size; i++) {
if(values[i] != null) {
queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]);
int size = propertyNames.length;
for (int i = 0; i < size; i++) {
if(values[i] != null) {
queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]);
}
}
}
queryString.append(" " + orderByStuff);
queryString.append(" " + orderByStuff);
Query queryObject = entityManager.createQuery(queryString.toString()).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize());
for (int i = 0; i < size; i++) {
if(values[i] != null) {
queryObject.setParameter(propertyNames[i], values[i]);
Query queryObject = entityManager.createQuery(queryString.toString()).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize());
for (int i = 0; i < size; i++) {
if(values[i] != null) {
queryObject.setParameter(propertyNames[i], values[i]);
}
}
}
return queryObject.getResultList();
return queryObject.getResultList();
}else{
return new ArrayList<T>();
}
}
@Override
public List<T> findByHqlWherePage(String hqlWhere, Pager pager) {
StringBuffer queryString = new StringBuffer();
queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 ");
if(pager.getTotalRows() > 0) {
StringBuffer queryString = new StringBuffer();
queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 ");
if (hqlWhere != null && hqlWhere.length() > 0) {
queryString.append(hqlWhere);
}
if (hqlWhere != null && hqlWhere.length() > 0) {
queryString.append(hqlWhere);
}
return entityManager.createQuery(queryString.toString())
return entityManager.createQuery(queryString.toString())
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
.getResultList();
}else{
return new ArrayList<T>();
}
}
@Override
@ -680,31 +700,39 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findByHqlPage(String hqlWhere, Pager pager) {
StringBuffer queryString = new StringBuffer();
queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 ");
if(pager.getTotalRows() > 0){
StringBuffer queryString = new StringBuffer();
queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 ");
if (hqlWhere != null && hqlWhere.length() > 0) {
queryString.append(hqlWhere);
}
if (hqlWhere != null && hqlWhere.length() > 0) {
queryString.append(hqlWhere);
}
return entityManager.createQuery(queryString.toString())
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
.getResultList();
return entityManager.createQuery(queryString.toString())
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
.getResultList();
}else{
return new ArrayList<T>();
}
}
@Override
public List<T> findByHqlPage(String hql, Pager pager, String[] paramName, Object[] paramValue) {
Query queryObject = entityManager.createQuery(hql);
for(int i=0;i<paramName.length;i++){
if(paramValue[i] != null) {
queryObject.setParameter(paramName[i], paramValue[i].toString());
if(pager.getTotalRows() > 0) {
Query queryObject = entityManager.createQuery(hql);
for (int i = 0; i < paramName.length; i++) {
if (paramValue[i] != null) {
queryObject.setParameter(paramName[i], paramValue[i].toString());
}
}
}
return queryObject.setFirstResult(pager.getStartRow())
return queryObject.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
.getResultList();
}else{
return new ArrayList<T>();
}
}
@Override
@ -719,18 +747,26 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List findBySqlPage(String sql, Pager pager) {
return entityManager.createNativeQuery(sql)
if(pager.getTotalRows() > 0) {
return entityManager.createNativeQuery(sql)
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
.getResultList();
}else{
return new ArrayList();
}
}
@Override
public List<?> findBySqlPage(String sql, Class entity, Pager pager) {
return entityManager.createNativeQuery(sql,entity)
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
.getResultList();
if(pager.getTotalRows() > 0){
return entityManager.createNativeQuery(sql,entity)
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
.getResultList();
}else{
return new ArrayList();
}
}
@Override
@ -793,17 +829,21 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findColumnsByHql(String hql, String hqlWhere, String orderByStuff, Pager pager) {
StringBuffer queryString = new StringBuffer();
if(pager.getTotalRows() > 0) {
StringBuffer queryString = new StringBuffer();
queryString.append(hql + " as model where 1=1 ");
queryString.append(hql + " as model where 1=1 ");
if (hqlWhere != null && hqlWhere.length() > 0) {
queryString.append(hqlWhere);
}
if (hqlWhere != null && hqlWhere.length() > 0) {
queryString.append(hqlWhere);
}
queryString.append(" " + orderByStuff);
queryString.append(" " + orderByStuff);
return entityManager.createQuery(queryString.toString()).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
return entityManager.createQuery(queryString.toString()).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
}else{
return new ArrayList<T>();
}
}
@Override
@ -825,19 +865,27 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<Object[]> findByHqlPageObjects(String hql, Pager pager) {
return entityManager.createQuery(hql).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
if(pager.getTotalRows() > 0){
return entityManager.createQuery(hql).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
}else{
return new ArrayList<Object[]>();
}
}
@Override
public List<Object[]> findByHqlPageObjects(String hql, Pager pager, String[] paramName, Object[] paramValue) {
Query queryObject = entityManager.createQuery(hql);
for(int i=0;i<paramName.length;i++){
if(paramValue[i] != null) {
queryObject.setParameter(paramName[i], paramValue[i].toString());
if(pager.getTotalRows() > 0) {
Query queryObject = entityManager.createQuery(hql);
for (int i = 0; i < paramName.length; i++) {
if (paramValue[i] != null) {
queryObject.setParameter(paramName[i], paramValue[i].toString());
}
}
}
return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
}else{
return new ArrayList<Object[]>();
}
}
@Override
@ -847,10 +895,14 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<Object[]> findBySqlObjListByPager(String sql, Pager pager) {
return entityManager.createNativeQuery(sql)
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
.getResultList();
if(pager.getTotalRows() > 0){
return entityManager.createNativeQuery(sql)
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
.getResultList();
}else{
return new ArrayList<Object[]>();
}
}
/**

22
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java
Unescape Escape View File

@ -0,0 +1,22 @@
package cn.estsh.i3plus.pojo.model.platform;
import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate;
import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam;
import lombok.Data;
import java.util.List;
/**
* @Description : 打印模板封装model
* @Reference :
* @Author : siliter
* @CreateDate : 2019-03-18 13:52
* @Modify:
**/
@Data
public class LabelTemplateModel {
private SysLabelTemplate labelTemplate;
private List<SysLabelTemplateParam> templateParamList;
}

45
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java
Unescape Escape View File

@ -0,0 +1,45 @@
package cn.estsh.i3plus.pojo.model.wms;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description : 订单打印数据封装model
* @Reference :
* @Author : siliter
* @CreateDate : 2019-03-18 11:50
* @Modify:
**/
@Data
public class PrintOrderDataModel {
@ApiParam(value = "工厂代码")
public String organizeCode;
@ApiParam(value = "单号")
public String orderNo;
@ApiParam(value = "业务类型", example = "-1")
public Integer busiType;
@ApiParam(value = "状态", example = "-1")
public Integer status;
@ApiParam(value = "打印标志", example = "-1")
public Integer printFlag;
@ApiParam(value = "供应商编号")
public String vendorNo;
@ApiParam(value = "客户编号")
public String custNo;
@ApiParam(value = "版本")
public String version;
@ApiParam(value = "ERP单号")
public String erpSrcNo;
@ApiParam(value = "业务数据类型", example = "-1")
public Integer busiDataType;
}

6
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.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.CommonEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -38,6 +39,11 @@ public class SysDictionary extends BaseBean {
@ApiParam(value ="字典代码")
private String dictionaryCode;
//枚举 CommonEnumUtil.SOFT_TYPE
@Column(name="SOFT_TYPE")
@ApiParam(value ="微服务软件类型")
private Integer softType;
// 根节点-1
@Column(name="PARENT_ID")
@ApiParam(value ="父节点" , example = "-1")

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

@ -0,0 +1,48 @@
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;
import javax.persistence.Transient;
/**
* @Description : 打印模板
* @Reference :
* @Author : siliter
* @CreateDate : 2019-03-18 11:00
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LABEL_TEMPLATE")
@Api(value="打印模板",description = "打印模板")
public class SysLabelTemplate extends BaseBean {
@Column(name="TEMPLATE_CODE")
@ApiParam(value ="模板代码")
private String templateCode;
@Column(name="TEMPLATE_NAME")
@ApiParam(value ="模板名称")
private String templateName;
@Column(name="TEMPLATE_CONTENT", columnDefinition = "TEXT")
@ApiParam(value ="模板内容")
private String templateContent;
// 参数拼接，多参数都好分隔，后台在做处理
@ApiParam(value ="模板参数拼接")
@Transient
private String paramsPack;
}

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

@ -0,0 +1,55 @@
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;
import javax.persistence.Transient;
/**
* @Description : 打印模板参数
* @Reference :
* @Author : siliter
* @CreateDate : 2019-03-18 11:00
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LABEL_TEMPLATE_PARAM")
@Api(value="打印模板参数",description = "打印模板参数")
public class SysLabelTemplateParam extends BaseBean {
@Column(name="TEMPLATE_ID")
@ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long templateId;
@Column(name="TEMPLATE_CODE")
@ApiParam(value ="模板代码")
private String templateCode;
@Column(name="TEMPLATE_PARAM")
@ApiParam(value ="模板参数")
private String templateParam;
@Column(name="TEMPLATE_PARAM_TEXT", columnDefinition = "TEXT")
@ApiParam(value ="模板参数描述")
private String templateParamText;
// 参数拼接，多参数都好分隔，后台在做处理
@ApiParam(value ="模板参数值")
@Transient
private String templateParamValue;
}

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

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -26,7 +27,13 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_TOOL")
@Table(name="SYS_TOOL",indexes =
{
@Index(name="sys_tool_tool_type_idx",columnList = "tool_type_id"),
@Index(name="sys_tool_tool_status_idx",columnList = "TOOL_STATUS"),
@Index(name="sys_tool_tool_conn_type_idx",columnList = "TOOL_CONN_TYPE"),
@Index(name="sys_tool_tool_data_type_idx",columnList = "TOOL_DATA_TYPE")
})
@Api(value="硬件设备表",description = "硬件设备表")
public class SysTool extends BaseBean {

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateParamRepository.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.SysLabelTemplateParam;
/**
* @Description : 打印模板
* @Reference :
* @Author : siliter
* @Date : 2019-03-18 12:03:01.024
* @Modify :
**/
public interface SysLabelTemplateParamRepository extends BaseRepository<SysLabelTemplateParam, Long> {
}

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLabelTemplateRepository.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.SysLabelTemplate;
/**
* @Description : 打印模板
* @Reference :
* @Author : siliter
* @Date : 2019-03-18 12:03:01.024
* @Modify :
**/
public interface SysLabelTemplateRepository extends BaseRepository<SysLabelTemplate, Long> {
}

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

@ -406,9 +406,10 @@ public class CoreHqlPack {
// and
HqlPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result);
HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
HqlPack.getNumEqualPack(dictionary.getSoftType(),"softType",result);
// not
HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
HqlPack.getNumNOEqualPack(dictionary.getParentId(),"parentId",result);
// 添加默认排序
HqlPack.getOrderDefault(dictionary);
@ -426,9 +427,10 @@ public class CoreHqlPack {
// and
HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result);
HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
HqlPack.getNumEqualPack(dictionary.getSoftType(),"softType",result);
// not
HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
HqlPack.getNumNOEqualPack(dictionary.getParentId(),"parentId",result);
// 添加默认排序
HqlPack.getOrderDefault(dictionary);
@ -665,4 +667,40 @@ public class CoreHqlPack {
return result.toString();
}
/**
* 打印模板复杂查询
* @param sysLabelTemplate
* @return
*/
public static String packHqlSysLabelTemplate(SysLabelTemplate sysLabelTemplate) {
StringBuffer result = new StringBuffer();
// hql拼接
HqlPack.getStringLikerPack(sysLabelTemplate.getTemplateName(),"templateName",result);
HqlPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(),"templateCode",result);
// 添加默认排序
HqlPack.getOrderDefault(sysLabelTemplate);
return result.toString();
}
/**
* 打印模板参数复杂查询
* @param sysLabelTemplateParam
* @return
*/
public static String packHqlSysLabelTemplateParams(SysLabelTemplateParam sysLabelTemplateParam) {
StringBuffer result = new StringBuffer();
// hql拼接
HqlPack.getNumEqualPack(sysLabelTemplateParam.getTemplateId(), "templateId", result);
HqlPack.getStringEqualPack(sysLabelTemplateParam.getTemplateCode(), "templateCode", result);
// 添加默认排序
HqlPack.getOrderDefault(sysLabelTemplateParam);
return result.toString();
}
}

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

@ -49,8 +49,6 @@ public class BrLayoutRow extends BaseBean {
@ApiParam(value ="排序")
private Integer rowSort;
private Integer rowSeq;
@Column(name="ROW_STYLE",columnDefinition = "TEXT")
@ApiParam(value ="行样式")
private String rowStyle;

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

@ -34,18 +34,10 @@ public class WmsASNMaster extends BaseBean {
@ApiParam("订单号")
public String orderNo;
/**
* 单据类型:REG=原物料采购,
* SUB=委外采购,TAR=多角贸易采购,TAP=多角代采购
*/
@Column(name = "ASN_TYPE")
@ApiParam("单据类型")
public String asnType;
/**
* 状态:1=新建,10=收货中,20=收货完成,
* 30=入库中,40=入库完成,90=已关闭,91=已取消
*/
@Column(name = "ASN_STATUS")
@ApiParam(value = "状态", example = "0")
public Integer asnStatus;
@ -74,7 +66,4 @@ public class WmsASNMaster extends BaseBean {
@ApiParam(value = "是否生产任务", example = "1")
public Integer isTask;
@Transient
@ApiParam(value = "单据明细集合")
public List<WmsASNMasterDetails> wmsASNMasterDetailsList;
}

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

@ -56,11 +56,11 @@ public class WmsASNMasterDetails extends BaseBean {
@ApiParam("PO行号")
public String poItem;
@Column(name = "ZDATE")
@Column(name = "PLAN_DATE")
@ApiParam("计划交货日期")
public String planDate;
@Column(name = "ZTIME")
@Column(name = "PLAN_TIME")
@ApiParam("计划交货时间")
public String planTime;
@ -110,16 +110,4 @@ public class WmsASNMasterDetails extends BaseBean {
@ApiParam(value = "已收数量", example = "0")
public Double recQty;
@Override
public String toString() {
return "WmsASNMasterDetails{" +
"recQty=" + recQty +
", partNo='" + partNo + '\'' +
", partNameRdd='" + partNameRdd + '\'' +
", item=" + item +
", qty=" + qty +
", unit='" + unit + '\'' +
", orderNo='" + orderNo + '\'' +
'}';
}
}

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

@ -69,6 +69,12 @@ public class WmsActionResponseBean<Obj> {
public Boolean isBtnDisabled = true;
/**
* 默认为true，如果这个值为true就禁用按钮否则可用，
*/
@ApiParam(value = "按钮是否禁用")
public Boolean isDetailsBtnDisabled = true;
/**
* 与 toSelected 属性配合使用，
* 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件
*/

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

@ -79,13 +79,13 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam(value = "条码打印数量", example = "1")
private Double printQty;
@Column(name = "ZDATE")
@Column(name = "PLAN_DATE")
@ApiParam(value = "计划日期")
private String zdate;
private String planDate;
@Column(name = "ZTIME")
@Column(name = "PLAN_TIME")
@ApiParam(value = "计划时间")
private String ztime;
private String planTime;
@Column(name = "SRC_NO")
@ApiParam(value = "源单号")

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

@ -55,9 +55,9 @@ public class WmsDocMovementMaster extends BaseBean {
@ApiParam(value = "状态", example = "1")
public Integer orderStatus;
@Column(name = "CUSTOMER_NO")
@Column(name = "CUST_NO")
@ApiParam(value = "客户编号")
private String customerNo;
private String custNo;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编号")
@ -97,4 +97,7 @@ public class WmsDocMovementMaster extends BaseBean {
@Column(name = "CUST_ORDER_NO")
@ApiParam(value = "客户单号")
private String custOrderNo;
@Transient
private List<WmsDocMovementDetails> movementDetailsList;
}

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

@ -67,13 +67,13 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam(value = "质检不合格数量", example = "0")
public Double ngQty;
@Column(name = "ZDATE")
@Column(name = "PLAN_DATE")
@ApiParam("计划交货日期")
public String zDate;
public String planDate;
@Column(name = "ZTIME")
@Column(name = "PLAN_TIME")
@ApiParam("计划交货时间")
public String zTime;
public String planTime;
@Column(name = "ERP_WH_NO")
@ApiParam("默认收货库存地")

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

@ -75,14 +75,4 @@ public class WmsQCDetails extends BaseBean {
@Column(name = "REJECT_QTY")
@ApiParam(value = "不合格数量", example = "0")
public Double rejectQty;
@Column(name = "QC_USER")
@ApiParam("检验员")
public String qcUser;
@Column(name = "QC_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "检验时间", example = "2000-01-01 01:00:00")
public String qcTime;
}

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

@ -52,9 +52,9 @@ public class WmsQCMaster extends BaseBean {
@ApiParam("备注")
public String remark;
@Column(name = "CUSTOMER_NO")
@Column(name = "CUST_NO")
@ApiParam("客户编号")
public String customerNo;
public String custNo;
@Column(name = "VENDOR_NO")
@ApiParam("供应商编号")

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -70,4 +71,13 @@ public class WmsQCTrans extends BaseBean {
@Column(name="SN")
@ApiParam("条码")
public String sn;
@Column(name = "QC_USER")
@ApiParam("检验员")
public String qcUser;
@Column(name = "QC_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "检验时间", example = "2000-01-01 01:00:00")
public String qcTime;
}

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

@ -0,0 +1,86 @@
package cn.estsh.i3plus.pojo.wms.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 org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
* @Description : 作业任务生成日志
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-03-18 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_TASK_CREATE_LOG")
@Api("作业任务生成日志表")
public class WmsTaskCreateLog extends BaseBean {
@Column(name = "TASK_NO")
@ApiParam("任务单号")
public String taskNo;
@Column(name = "DATA_SRC")
@ApiParam("数据来源")
public String dataSrc;
@Column(name = "OP_TYPE_CODE")
@ApiParam("作业类型")
public String opTypeCode;
@Column(name = "ERROR_MESSAGE")
@ApiParam("错误信息")
public String errorMessage;
@Column(name = "TRANS_STATUS")
@ApiParam("处理状态")
public Integer transStatus;
@Column(name = "REF_SRC")
@ApiParam(value = "关联单号")
private String refSrc;
@Column(name = "CALL_CLASS")
@ApiParam("实现类")
public String callClass;
@Column(name = "CALL_FUN")
@ApiParam("实现类")
public String callFun;
@Column(name = "START_TIME")
@ApiParam("开始执行时间")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
public Date startTime;
@Column(name = "END_TIME")
@ApiParam("结束执行时间")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
public Date endTime;
@Column(name = "IN_PARAMS")
@ApiParam(value = "输入参数")
private String inParams;
@Column(name = "OUT_PARAMS")
@ApiParam(value = "输出参数")
private String outParams;
@Column(name = "OUT_RESULT")
@ApiParam(value = "执行结果")
private String outResult;
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsTaskCreateLog;
/**
* @Description : 作业任务生成日志
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-03-18 15:58
* @Modify:
**/
public interface WmsTaskCreateLogRepository extends BaseRepository<WmsTaskCreateLog, Long> {
}

50
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -64,8 +64,8 @@ public class WmsHqlPack {
HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result);
HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "planTime", result);
HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "planDate", result);
HqlPack.getStringLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result);
HqlPack.getStringLikerPack(wmsPOMasterDetails.getPlanDate(), "planDate", result);
getStringBuilderPack(wmsPOMasterDetails, result);
@ -122,7 +122,7 @@ public class WmsHqlPack {
HqlPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result);
HqlPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", result);
HqlPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", result);
HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustomerNo(), "customerNo", result);
HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustNo(), "custNo", result);
getStringBuilderPack(wmsDocMovementMaster, result);
@ -788,7 +788,11 @@ public class WmsHqlPack {
//查询参数封装
HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
HqlPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
HqlPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result);
HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
HqlPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
getStringBuilderPack(wmsStockSn, result);
return result.toString();
@ -808,6 +812,7 @@ public class WmsHqlPack {
HqlPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result);
HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result);
HqlPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result);
getStringBuilderPack(wmsStockQuan, result);
@ -878,6 +883,7 @@ public class WmsHqlPack {
HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(),"id",result);
HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result);
getStringBuilderPack(wmsMoveMaster, result);
@ -1414,9 +1420,6 @@ public class WmsHqlPack {
*/
public static String packHqlWmsDataAuthFind(WmsDataAuth wmsDataAuth) {
StringBuffer result = new StringBuffer();
if (!Strings.isNullOrEmpty(wmsDataAuth.getOrganizeCode())){
HqlPack.getStringEqualPack(wmsDataAuth.getOrganizeCode(),"organizeCode",result);
}
if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())){
HqlPack.getStringEqualPack(wmsDataAuth.getRoleCode(),"roleCode",result);
}
@ -1441,4 +1444,37 @@ public class WmsHqlPack {
getStringBuilderPack(taskDetails, result);
return result.toString();
}
/**
* 根据条件查询任务生成日志
* @param wmsTaskCreateLog
* @return
*/
public static String packHqlWmsTaskCreateLog(WmsTaskCreateLog wmsTaskCreateLog) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wmsTaskCreateLog.getTaskNo(), "taskNo", result);
HqlPack.getStringEqualPack(wmsTaskCreateLog.getOpTypeCode(), "opTypeCode", result);
getStringBuilderPack(wmsTaskCreateLog, result);
return result.toString();
}
/**
* 根据条件查询作业处理组件
* @param wmsTransModule
* @return
*/
public static String packHqlWmsTransModule(WmsTransModule wmsTransModule) {
StringBuffer result = new StringBuffer();
if(!Strings.isNullOrEmpty(wmsTransModule.getTmName())){
HqlPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result);
}
if(!Strings.isNullOrEmpty(wmsTransModule.getCallClass())){
HqlPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result);
}
if(!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())){
HqlPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result);
}
getStringBuilderPack(wmsTransModule, result);
return result.toString();
}
}

Write Preview
Loading…
Cancel
Save