解决# Conflicts:

#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
yun-zuoyi
柯裕 7 years ago
commit 10520504f0

@ -0,0 +1,41 @@
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-01 11:45
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name="T_INTERFACE_DEVICE")
@Api("接口驱动类信息")
public class InterfaceDevice extends BaseBean {
@Column(name="device_name")
@ApiParam("驱动名称")
private String deviceName;
@Column(name="device_classname")
@ApiParam("驱动类名称")
private String deviceClassName;
@Column(name="status")
@ApiParam("状态 【0-禁用 1-正常】")
private Integer status;
}

@ -0,0 +1,100 @@
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;
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-01 11:56
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name="T_INTERFACE_TYPE")
@Api("接口类型信息")
public class InterfaceType extends BaseBean {
@Column(name="tp_id")
@ApiParam("接口编号")
@JsonSerialize(using = ToStringSerializer.class)
private Long tpId;
@Column(name="tp_typ")
@ApiParam("接口类型")
private String tpTyp;
@Column(name="pb_no")
@ApiParam("发布方编码")
private String pbNo;
@Column(name="tp_no")
@ApiParam("接口编码")
private String tpNo;
@Column(name="tp_desc")
@ApiParam("接口主题描述")
private String tpDesc;
@Column(name="mes_tab")
@ApiParam("接口业务表")
private String mesTab;
@Column(name="mes_group")
@ApiParam("业务表的分组条件")
private String mesGroup;
@Column(name="mes_pk")
@ApiParam("业务表主键")
private String mesPk;
@Column(name="act_type")
@ApiParam("业务类型")
private Integer actType;
@Column(name="act_desc")
@ApiParam("业务描述")
private String actDesc;
@Column(name="device_id")
@ApiParam("驱动类编号")
@JsonSerialize(using = ToStringSerializer.class)
private Long deviceId;
@Column(name="request_url")
@ApiParam("服务器请求路径")
private String requestUrl;
@Column(name="cfile_path")
@ApiParam("客户文件路径")
private String cfilePath;
public Long getTpId() {
if(tpId != null) {
return tpId.longValue();
}else{
return tpId;
}
}
public Long getDeviceId() {
if(deviceId != null) {
return deviceId.longValue();
}else{
return deviceId;
}
}
}

@ -5,7 +5,6 @@ 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 io.swagger.models.auth.In;
import lombok.Data;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -15,7 +14,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Description :
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2018-11-01 13:21
@ -26,7 +25,7 @@ import javax.persistence.Table;
@Table(name="WMS_TRANS")
@DynamicInsert
@DynamicUpdate
@Api(value="库交易记录表",description = "库交易记录表")
@Api(value="交易记录表",description = "交易记录表")
public class WmsTrans extends BaseBean{
@Column(name="ORDER_NO")
@ -52,7 +51,7 @@ public class WmsTrans extends BaseBean{
@Column(name="TRANS_STATUS")
@ApiParam(value ="交易状态")
private String Trans_status;
private Integer transStatus;
@Column(name="QTY")
@ApiParam(value ="需求数")
@ -70,29 +69,25 @@ public class WmsTrans extends BaseBean{
@ApiParam(value ="单位")
private String unit;
@Column(name="SRC_LOC_ID")
@ApiParam(value ="来源库位id")
@Column(name="LOC_ID")
@ApiParam(value ="库位id")
@JsonSerialize(using = ToStringSerializer.class)
private Long srcLocId;
private Long locId;
@Column(name="SRC_LOC_CODE")
@ApiParam(value ="来源库位代码")
private String srcLocCode;
@Column(name="LOC_CODE")
@ApiParam(value ="库位代码")
private String locCode;
@Column(name="DEST_LOC_ID")
@ApiParam(value ="目标库位id")
@Column(name="GROUP_ID")
@ApiParam(value ="分组id")
@JsonSerialize(using = ToStringSerializer.class)
private Long destLocId;
private Long groupId;
@Column(name="DEST_LOC_CODE")
@ApiParam(value ="目标库位代码")
private String destLocCode;
public Long getSrcLocId() {
if(srcLocId != null) {
return srcLocId.longValue();
public Long getLocId() {
if(locId != null) {
return locId.longValue();
}else{
return srcLocId;
return locId;
}
}
@ -103,12 +98,4 @@ public class WmsTrans extends BaseBean{
return partId;
}
}
public Long getDestLocId() {
if(destLocId != null) {
return destLocId.longValue();
}else{
return destLocId;
}
}
}

@ -51,7 +51,7 @@ public class WmsTransRcd extends BaseBean{
@Column(name="TRANS_STATUS")
@ApiParam(value ="交易状态")
private Integer TransStatus;
private Integer transStatus;
@Column(name="QTY")
@ApiParam(value ="需求数")
@ -69,29 +69,25 @@ public class WmsTransRcd extends BaseBean{
@ApiParam(value ="单位")
private String unit;
@Column(name="SRC_LOC_ID")
@ApiParam(value ="来源库位id")
@Column(name="LOC_ID")
@ApiParam(value ="库位id")
@JsonSerialize(using = ToStringSerializer.class)
private Long srcLocId;
private Long locId;
@Column(name="SRC_LOC_CODE")
@ApiParam(value ="来源库位代码")
private String srcLocCode;
@Column(name="LOC_CODE")
@ApiParam(value ="库位代码")
private String locCode;
@Column(name="DEST_LOC_ID")
@ApiParam(value ="目标库位id")
@Column(name="GROUP_ID")
@ApiParam(value ="分组id")
@JsonSerialize(using = ToStringSerializer.class)
private Long destLocId;
private Long groupId;
@Column(name="DEST_LOC_CODE")
@ApiParam(value ="目标库位代码")
private String destLocCode;
public Long getSrcLocId() {
if(srcLocId != null) {
return srcLocId.longValue();
public Long getLocId() {
if(locId != null) {
return locId.longValue();
}else{
return srcLocId;
return locId;
}
}
@ -102,12 +98,4 @@ public class WmsTransRcd extends BaseBean{
return partId;
}
}
public Long getDestLocId() {
if(destLocId != null) {
return destLocId.longValue();
}else{
return destLocId;
}
}
}

@ -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.InterfaceDevice;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-01 15:13
* @Modify:
**/
@Repository
public interface InterfaceDeviceRepository extends BaseRepository<InterfaceDevice, Long> {
}

@ -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.WmsTransRcd;
/**
* @Description :
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2018-11-02 9:50
* @Modify:
**/
public interface WmsTransRcdRepository extends BaseRepository<WmsTransRcd, Long> {
}

@ -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.WmsTrans;
/**
* @Description :
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2018-11-02 9:49
* @Modify:
**/
public interface WmsTransRepository extends BaseRepository<WmsTrans, Long> {
}

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsTransType;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2018-11-02 9:49
* @Modify:
**/
public interface WmsTransTypeRepository extends BaseRepository<WmsTransType, Long> {
}

@ -1,8 +1,10 @@
package cn.estsh.i3plus.pojo.wms.sqlpack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.wms.bean.InterfaceDevice;
import cn.estsh.i3plus.pojo.wms.bean.WareHouse;
import cn.estsh.i3plus.pojo.wms.bean.WmsButton;
import cn.estsh.i3plus.pojo.wms.bean.WmsTransType;
/**
* @Description :
@ -41,4 +43,26 @@ public class WmsHqlPack {
return result.toString();
}
/**
*
* @return
*/
public static String packHqlInterfaceDevice(InterfaceDevice interfaceDevice){
StringBuffer sb = new StringBuffer();
//驱动类名称
HqlPack.getStringEqualPack(interfaceDevice.getDeviceClassName(),"deviceClassName",sb);
return null;
}
public static String packHqlWmsTransType(WmsTransType wmsTransType) {
StringBuffer result = new StringBuffer();
//查询参数封装
HqlPack.getStringEqualPack(wmsTransType.getTransCode(),"transCode",result);
HqlPack.getStringEqualPack(wmsTransType.getTransName(),"transName",result);
return result.toString();
}
}

Loading…
Cancel
Save