# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
yun-zuoyi
jimmy 7 years ago
commit 4ca1d70e0c

@ -92,9 +92,6 @@ public class SysUser extends BaseBean {
@ApiParam(value ="用户类型(枚举,待定)" , example ="-1")
private Integer userType;
@ApiParam(value ="用户信息")
private transient SysUserInfo userInfo;
@ApiParam(value ="用户所有角色信息")
private transient List<SysRole> roleList;

@ -0,0 +1,47 @@
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 javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-23 13:13
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_ACTION_GROUP")
@Api("作业流程")
public class WmsActionGroup extends BaseBean {
@Column(name="AG_NAME_E")
@ApiParam("英文流程名称")
private String agNameE;
@Column(name="AG_DESC_E")
@ApiParam("英文流程描述")
private String agDescE;
@Column(name="AG_NAME_C")
@ApiParam("中文流程名称")
private String agNameC;
@Column(name="AG_DESC_C")
@ApiParam("中文流程描述")
private String agDescC;
}

@ -0,0 +1,63 @@
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 javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-23 13:23
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_ACTION_GROUP_DETAILS")
@Api("作业流程明细")
public class WmsActionGroupDetails extends BaseBean {
@Column(name = "AG_ID")
@ApiParam(value = "作业流程ID", example = "0")
private Long agId;
@Column(name = "SEQ")
@ApiParam(value = "序号", example = "0")
private Integer seq;
@Column(name = "OK_SEQ")
@ApiParam(value = "成功跳转步骤", example = "0")
private Integer okSeq;
@Column(name = "NG_SEQ")
@ApiParam(value = "失败跳转步骤", example = "0")
private Integer ngSeq;
@Column(name = "VALUE_TYPE")
@ApiParam(value = "动作类型", example = "10")
private Integer valueType;
@Column(name = "TO_UPPER")
@ApiParam(value = "是否转为大写", example = "2")
private Integer toUpper;
@Column(name = "LEN_CHECK")
@ApiParam(value = "长度检查", example = "0")
private Integer lenCheck;
@Column(name = "AS_ID")
@ApiParam(value = "作业步骤", example = "0")
private Long asId;
}

@ -0,0 +1,73 @@
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;
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 : jessica.chen
* @CreateDate : 2018-11-23 13:14
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_ACTION_LOG_DATA")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="作业记录参数表",description = "作业记录参数表")
public class WmsActionLogData extends BaseBean {
@Column(name = "ALD_ID")
@ApiParam(value = "记录明细编号")
private Long aldId;
@Column(name = "ALD_SEQ")
@ApiParam(value = "步骤序号")
private Integer aldSeq;
@Column(name = "CALL_CLASS")
@ApiParam(value = "实现类")
private String callClass;
@Column(name = "CALL_FUN")
@ApiParam(value = "调用方法")
private String callFun;
@Column(name = "EXECUTE_STATUS")
@ApiParam(value = "执行状态")
private Integer executeStatus;
@Column(name = "START_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="开始执行时间",example = "2000-01-01 01:00:00")
private String startTime;
@Column(name = "END_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="结束执行时间",example = "2000-01-01 01:00:00")
private String 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;
}

@ -1,11 +1,9 @@
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 javax.persistence.Entity;
import java.util.List;
/**
@ -17,7 +15,7 @@ import java.util.List;
**/
@Data
@Api("返回前端数据实体")
public class WmsActionResponseBean extends BaseBean {
public class WmsActionResponseBean {
@ApiParam("进度")
public Double percent;

@ -0,0 +1,52 @@
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;
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 : jessica.chen
* @CreateDate : 2018-11-23 14:52
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_ACTION_STEP_CALL_PARAM")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="作业步骤调用参数表",description = "作业步骤调用参数表")
public class WmsActionStepCallParam extends BaseBean {
@Column(name = "AGD_ID")
@ApiParam(value = "流程明细编号")
private Long agdId;
@Column(name = "SEQ")
@ApiParam(value = "序号")
private Integer seq;
@Column(name = "AM_ID")
@ApiParam(value = "处理组件编号")
private Long amId;
@Column(name = "PARAM_CODE")
@ApiParam(value = "参数编码")
private String paramCode;
@Column(name = "PARAM_VALUE")
@ApiParam(value = "参数值")
private String paramValue;
}

@ -1,16 +1,9 @@
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 javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.List;
/**
@ -22,7 +15,7 @@ import java.util.List;
**/
@Data
@Api("接受前端数据实体")
public class WmsOperationBean extends BaseBean {
public class WmsOperationBean {
@ApiParam("扫描内容")
public String barCode;

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroupDetails;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-23 13:32
* @Modify:
**/
@Repository
public interface WmsActionGroupDetailsRepository extends BaseRepository<WmsActionGroupDetails,Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroup;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-23 13:34
* @Modify:
**/
@Repository
public interface WmsActionGroupRepository extends BaseRepository<WmsActionGroup,Long> {
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.BasVendor;
import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-07 14:49
* @Modify:
**/
@Repository
public interface WmsActionLogDataRepository extends BaseRepository<WmsActionLogData, Long> {
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData;
import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCallParam;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2018-11-23 15:00
* @Modify:
**/
@Repository
public interface WmsActionStepCallParamRepository extends BaseRepository<WmsActionStepCallParam, Long> {
}

@ -449,7 +449,7 @@ public class WmsHqlPack {
HqlPack.getStringEqualPack(wmsASNMaster.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result);
HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus().toString(), "asnStatus", result);
HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus(), "asnStatus", result);
HqlPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result);
HqlPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result);
HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);
@ -1071,4 +1071,49 @@ public class WmsHqlPack {
return result.toString();
}
/**
*
* @return
*/
public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup){
StringBuffer result = new StringBuffer();
//查询参数封装 agDescC;agNameC
HqlPack.getStringLikerPack(wmsActionGroup.getAgNameC(), "agNameC", result);
HqlPack.getStringLikerPack(wmsActionGroup.getAgDescC(), "agDescC", result);
getStringBuilderPack(wmsActionGroup, result);
return result.toString();
}
/**
*
*
* @param wmsActionLogData
* @return
*/
public static String packHqlWmsActionLogData(WmsActionLogData wmsActionLogData) {
StringBuffer result = new StringBuffer();
HqlPack.getNumEqualPack(wmsActionLogData.getAldId(), "aldId", result);
getStringBuilderPack(wmsActionLogData, result);
return result.toString();
}
/**
*
*
* @param wmsActionStepCallParam
* @return
*/
public static String packHqlWmsActionStepCallParam(WmsActionStepCallParam wmsActionStepCallParam) {
StringBuffer result = new StringBuffer();
HqlPack.getNumEqualPack(wmsActionStepCallParam.getAgdId(), "agdId", result);
getStringBuilderPack(wmsActionStepCallParam, result);
return result.toString();
}
}

Loading…
Cancel
Save