Merge remote-tracking branch 'origin/master'

yun-zuoyi
alwaysfrin 7 years ago
commit 7bccea177e

@ -0,0 +1,56 @@
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 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-07 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name="BAS_VENDOR")
@Api("供应商")
public class BasVendor extends BaseBean{
@Column(name="VENDOR_NO")
@ApiParam("供应商编号")
private String vendorNo;
@Column(name="VENDOR_NAME")
@ApiParam("供应商简称")
private String vendorName;
@Column(name="VENDOR_DESC")
@ApiParam("供应商全称")
private String vendorDesc;
@Column(name="VENDOR_ADDR")
@ApiParam("供应商地址")
private String vendorAddr;
@Column(name="VENDOR_OWNER")
@ApiParam("联系人")
private String vendorOwner;
@Column(name="VENDOR_EMAIL")
@ApiParam("邮箱")
private String vendorEmail;
@Column(name="IS_ASN")
@ApiParam("是否发ASN")
private Integer isAsn;
}

@ -0,0 +1,45 @@
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 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-07 14:41
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name="WMS_OP_TYPE")
@Api("作业类型")
public class WmsOpType extends BaseBean{
@Column(name="OP_TYPE_CODE")
@ApiParam("类型编号")
private String opTypeCode;
@Column(name="OP_TYPE_NAME")
@ApiParam("类型名称")
private String opTypeName;
@Column(name="SEQ")
@ApiParam("序号")
private Integer seq;
@Column(name="PROG_CODE")
@ApiParam("处理程序")
private String proCode;
}

@ -1,8 +1,6 @@
package cn.estsh.i3plus.pojo.wms.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;
@ -14,7 +12,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Description :
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2018-11-07 16:06
@ -65,7 +63,7 @@ public class WmsPart extends BaseBean {
@Column(name="ABC")
@ApiParam(value ="分类")
private String ABC;
private String abc;
@Column(name="BUY_UNIT")
@ApiParam(value ="采购单位")

@ -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.BasVendor;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-07 14:49
* @Modify:
**/
@Repository
public interface BasVendorRepository extends BaseRepository<BasVendor, 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.WmsOpType;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-07 14:46
* @Modify:
**/
@Repository
public interface WmsOpTypeRepository extends BaseRepository<WmsOpType, Long> {
}

@ -4,7 +4,7 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsPart;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Description :Repository
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2018-11-08 10:19

@ -1,11 +1,7 @@
package cn.estsh.i3plus.pojo.wms.sqlpack;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.wms.bean.*;
import cn.estsh.i3plus.pojo.wms.bean.WareHouse;
import cn.estsh.i3plus.pojo.wms.bean.WmsTrans;
import cn.estsh.i3plus.pojo.wms.bean.WmsTransType;
/**
* @Description :
@ -15,6 +11,37 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsTransType;
* @Modify:
**/
public class WmsHqlPack {
/**
*
*
* @param wmsPart
* @return
*/
public static String packHqlWmsPart(WmsPart wmsPart) {
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
HqlPack.timeBuilder(wmsPart.getCreateDateTimeStart(), wmsPart.getCreateDateTimeEnd(), "createDateTime", result, true);
HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
HqlPack.getStringLikerPack(wmsPart.getAbc(), "ABC", result);
HqlPack.getNumEqualPack(wmsPart.getIqc(), "iqc", result);
HqlPack.getStringLikerPack(wmsPart.getPartGroup(), "partGroup", result);
return result.toString();
}
/**
*
* @param wmsIbCheckPlan
* @return
*/
public static String packHqlWmsIbCheckPlan(WmsIbCheckPlan wmsIbCheckPlan) {
StringBuffer result = new StringBuffer();
//查询参数封装
HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
return result.toString();
}
/**
*
@ -155,7 +182,79 @@ public class WmsHqlPack {
HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result);
HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result);
HqlPack.getStringLikerPack(wareHouse.getName(), "name", result);
HqlPack.getStringEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()+"","isValid",result);
HqlPack.getNumEqualPack(wareHouse.getIsValid(),"isValid",result);
return result.toString();
}
/**
*
* @param basVendor
* @return
*/
public static String packHqlBasVendor(BasVendor basVendor){
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", result);
HqlPack.getStringLikerPack(basVendor.getVendorName(), "vendorName", result);
HqlPack.getStringLikerPack(basVendor.getVendorOwner(), "vendorOwner", result);
HqlPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result);
HqlPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result);
HqlPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result);
if(basVendor.getIsAsn()!= null){
HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result);
}
HqlPack.getNumEqualPack(basVendor.getIsValid(),"isValid",result);
return result.toString();
}
/**
*
* @param wmsOpType
* @return
*/
public static String packHqlWmsOpType(WmsOpType wmsOpType){
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(),"opTypeName",result);
HqlPack.getStringLikerPack(wmsOpType.getSeq().toString(),"seq",result);
HqlPack.getStringLikerPack(wmsOpType.getProCode(),"proCode",result);
HqlPack.getNumEqualPack(wmsOpType.getIsValid(),"isValid",result);
return result.toString();
}
/**
*
* @param wareHouse
* @return
*/
public static String packHqlWareHouseUnique(WareHouse wareHouse){
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wareHouse.getName(), "name", result);
HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result);
HqlPack.getNumNOEqualPack(wareHouse.getId(), "id", result);
return result.toString();
}
/**
*
* @param basVendor
* @return
*/
public static String packHqlBasVendorUnique(BasVendor basVendor){
StringBuffer result = new StringBuffer();
if(basVendor.getId()!=null){
HqlPack.getNumNOEqualPack(basVendor.getId(), "id", result);
}
HqlPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result);
HqlPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result);
HqlPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result);
return result.toString();
}
public static String packHqlWmsOpTypeUnique(WmsOpType wmsOpType){
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(),"opTypeName",result);
return result.toString();
}

Loading…
Cancel
Save