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
gragon.xu 6 years ago
parent 4ef08afaa7 2e020d7be2
commit 78d551f8e7
18 changed files with 413 additions and 133 deletions
Show Stats Download Patch File Download Diff File

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

@ -1584,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)
@ -1852,7 +1888,7 @@ public class WmsEnumUtil {
STEP_SEQ("STEP_SEQ", "步骤调用序号"),
MOVE_ORDER_NO("MOVE_ORDER_NO", "移库单单号"),
QC_ORDER_NO("QC_ORDER_NO", "质检单单号"),
ORDER_NO("ORDER_NO", "盘点主表序号");
CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号");
private String code;
private String description;
@ -2032,4 +2068,87 @@ public class WmsEnumUtil {
return null;
}
}
/**
* 数据状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_STATUS {
YES(1, "是", "fa fa-success cell-fa fa-check"),
NO(2, "否", "fa fa-disabled cell-fa fa-times-circle");
private int value;
private String description;
private String code;
DATA_STATUS(int value, String code, String description){
this.value = value;
this.description = description;
this.code = code;
}
public int getValue () {
return value;
}
public String getDescription () {
return description;
}
public String getCode() {
return code;
}
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].getDescription();
}
}
return tmp;
}
}
/**
* 打印模板
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRINT_TEMPLATE {
SN_PRINT_TEMPLATE(10, "SN_PRINT_TEMPLATE", "条码打印模板"),
ORDER_PRINT_TEMPLATE(20, "ORDER_PRINT_TEMPLATE", "订单打印模板"),
RC_BACK_PRINT_TEMPLATE(30, "RC_BACK_PRINT_TEMPLATE", "收货回执打印模板");
private int value;
private String code;
private String description;
PRINT_TEMPLATE(int value, String code, String description){
this.value = value;
this.description = description;
this.code = code;
}
public int getValue () {
return value;
}
public String getDescription () {
return description;
}
public String getCode() {
return code;
}
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].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[]>();
}
}
/**

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

@ -0,0 +1,20 @@
package cn.estsh.i3plus.pojo.model.platform;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SysRole;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : siliter
* @CreateDate : 2019-03-19 13:52
* @Modify:
**/
@Data
public class UserRolePagerModel {
private SysRole sysRole;
private Pager pager;
}

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")

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

@ -25,19 +25,19 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LABELTEMPLATE")
@Table(name="SYS_LABEL_TEMPLATE")
@Api(value="打印模板",description = "打印模板")
public class SysLabelTemplate extends BaseBean {
@Column(name="TEMPLATECODE")
@Column(name="TEMPLATE_CODE")
@ApiParam(value ="模板代码")
private String templateCode;
@Column(name="TEMPLATENAME")
@Column(name="TEMPLATE_NAME")
@ApiParam(value ="模板名称")
private String templateName;
@Column(name="TEMPLATECONTENT", columnDefinition = "TEXT")
@Column(name="TEMPLATE_CONTENT", columnDefinition = "TEXT")
@ApiParam(value ="模板内容")
private String templateContent;

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

@ -27,24 +27,24 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LABELTEMPLATEPARAM")
@Table(name="SYS_LABEL_TEMPLATE_PARAM")
@Api(value="打印模板参数",description = "打印模板参数")
public class SysLabelTemplateParam extends BaseBean {
@Column(name="TEMPLATEID")
@Column(name="TEMPLATE_ID")
@ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long templateId;
@Column(name="TEMPLATECODE")
@Column(name="TEMPLATE_CODE")
@ApiParam(value ="模板代码")
private String templateCode;
@Column(name="TEMPLATEPARAM")
@Column(name="TEMPLATE_PARAM")
@ApiParam(value ="模板参数")
private String templateParam;
@Column(name="TEMPLATEPARAMTEXT", columnDefinition = "TEXT")
@Column(name="TEMPLATE_PARAM_TEXT", columnDefinition = "TEXT")
@ApiParam(value ="模板参数描述")
private String templateParamText;

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 {

6
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);

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;

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

@ -86,8 +86,7 @@ public class WmsCSOrderDetails extends BaseBean {
public Integer snStatus;
/**
* 处理状态:1=已创建,5=已盘,10=已冻结
* ,20=已解冻,30=取消冻结
* 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结
*/
@Column(name = "TRANS_STATUS")
@ApiParam(value = "处理状态", example = "1")

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

@ -65,4 +65,16 @@ public class WmsCSOrderMaster extends BaseBean {
@Column(name = "IS_TASK")
@ApiParam(value = "是否生产任务", example = "1")
public Integer isTask;
@Transient
@ApiParam(value = "盘点物料清单")
public String[] wmsCSParts;
@Transient
@ApiParam(value = "盘点存储区清单")
public String[] wmsCSZones;
@Transient
@ApiParam(value = "盘点库位清单")
public String[] wmsCSLocates;
}

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

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description : 盘点存储区信息
@ -35,4 +36,8 @@ public class WmsCSZone extends BaseBean {
@Column(name="ZONE_NO")
@ApiParam("存储区代码")
public String zoneNo;
@Transient
@ApiParam("库位代码")
public String locateNo;
}

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

@ -97,4 +97,7 @@ public class WmsDocMovementMaster extends BaseBean {
@Column(name = "CUST_ORDER_NO")
@ApiParam(value = "客户单号")
private String custOrderNo;
@Transient
private List<WmsDocMovementDetails> movementDetailsList;
}

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

@ -91,18 +91,9 @@ public class WmsOpType extends BaseBean {
@Column(name = "USE_TIME")
@ApiParam(value = "标准工时(每箱)", example = "0")
private Integer userTime;
private Integer useTime;
@Column(name = "IS_MULITI")
@ApiParam(value = "是否允许多人操作", example = "0")
private Integer isMuliti;
@Column(name = "TM_ID")
@ApiParam(value = "处理组件编号")
@JsonSerialize(using = ToStringSerializer.class)
private Long tmId;
@Column(name = "DATA_SRC")
@ApiParam("数据来源")
private String dataSrc;
}

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

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

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

@ -24,6 +24,12 @@ import java.util.stream.Collectors;
**/
public class WmsHqlPack {
public static String packInParams(String colnumName,String[] params){
StringBuffer sb = new StringBuffer();
HqlPack.getInPackString(String.join(",", params),colnumName,sb);
return sb.toString();
}
/**
* 封装公用查询参数
* @param bean 实体对象
@ -188,7 +194,7 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
HqlPack.getStringLikerPack(wmsPart.getPartName(), "partNameRdd", result);
HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
@ -351,7 +357,6 @@ public class WmsHqlPack {
HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
HqlPack.getNumEqualPack(wmsOpType.getTmId(), "tmId", result);
HqlPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result);
getStringBuilderPack(wmsOpType, result);
@ -782,7 +787,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();
@ -1467,4 +1476,16 @@ public class WmsHqlPack {
getStringBuilderPack(wmsTransModule, result);
return result.toString();
}
/**
* 根据条件查询系统配置信息
* @param wmsConfig
* @return
*/
public static String packHqlWmsConfig(WmsConfig wmsConfig) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result);
getStringBuilderPack(wmsConfig, result);
return result.toString();
}
}

Write Preview
Loading…
Cancel
Save