diff --git a/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java b/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java index fd8b9b5..a9cff7a 100644 --- a/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java @@ -43,7 +43,7 @@ public class TraceOrderEntity implements Serializable { */ @ApiModelProperty(value = "1:入库;2:出库") @TableField(value = "inOutType") - private Byte inOutType; + private Integer inOutType; /** * 单据类型 @@ -197,5 +197,8 @@ public class TraceOrderEntity implements Serializable { @TableField(value = "recordCode") private String recordCode; + + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/res/trace/TraceOrderResponse.java b/src/main/java/com/glxp/api/res/trace/TraceOrderResponse.java index 4a18531..15685ac 100644 --- a/src/main/java/com/glxp/api/res/trace/TraceOrderResponse.java +++ b/src/main/java/com/glxp/api/res/trace/TraceOrderResponse.java @@ -173,6 +173,17 @@ public class TraceOrderResponse { @ApiModelProperty(value = "查询记录号") private String recordCode; + //获取往来信息 + private String fromToCorp; + + //获取往来单位 + public String getFromToCorp() { + if (StrUtil.trimToEmpty(fromCorpCreditNum).equals(StrUtil.trimToEmpty(companyCertNum))) { + return toCorp; + } else + return fromCorp; + } + public String getToCorp() { if (StrUtil.isEmpty(toCorp)) return toUserInfo;