From 85311a7f16194faa264062df0c12884428f459f5 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 12 Jul 2023 16:24:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BE=80=E6=9D=A5=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/entity/trace/TraceOrderEntity.java   |  5 ++++-
 .../com/glxp/api/res/trace/TraceOrderResponse.java    | 11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

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;