From bc549167982d75284fffb8f0f71606934b989673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Tue, 22 Aug 2023 11:22:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=8C=BB=E9=99=A2=E5=BE=80=E6=9D=A5?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/controller/inout/IoOrderController.java    | 6 +++++-
 src/main/java/com/glxp/api/res/inout/IoOrderResponse.java   | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
index 78a2a6a43..97345c177 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
@@ -317,7 +317,11 @@ public class IoOrderController extends BaseController {
                 basicCorpEntity.setId(IdUtil.getSnowflakeNextId());
                 basicCorpService.insert(basicCorpEntity);
             }
-            orderEntity.setFromCorp(basicCorpEntity.getErpId());
+            if (addOrderRequest.getAction().equals(bussinessTypeEntity.getAction())){
+                orderEntity.setFromCorp(basicCorpEntity.getName());
+            }else {
+                orderEntity.setFromCorp(basicCorpEntity.getErpId());
+            }
         } else {
             orderEntity.setFromCorp(addOrderRequest.getFromCorp());
         }
diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
index 3495da336..d04420fe8 100644
--- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
@@ -253,6 +253,8 @@ public class IoOrderResponse {
             return fromCorpName;
         if (StrUtil.isNotEmpty(fromInvName))
             return fromInvName;
+        if (StrUtil.isNotEmpty(fromCorp))
+            return fromCorp;
         return fromName;
     }