From 9762e04dbd93140e8babe5af0bc2f58da8298ede Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Thu, 2 Mar 2023 17:12:41 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8D=AE=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=97=A0=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/inout/impl/IoOrderServiceImpl.java | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
index 1d421037b..4e8290b4d 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
@@ -16,10 +16,12 @@ import com.glxp.api.constant.ConstantType;
 import com.glxp.api.dao.auth.DeptDao;
 import com.glxp.api.dao.auth.InvWarehouseDao;
 import com.glxp.api.dao.basic.BasicBussinessTypeDao;
+import com.glxp.api.dao.basic.BasicCorpDao;
 import com.glxp.api.dao.inout.IoOrderDao;
 import com.glxp.api.dao.thrsys.ThrSystemBusApiDao;
 import com.glxp.api.dao.thrsys.ThrSystemDao;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
+import com.glxp.api.entity.basic.BasicCorpEntity;
 import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.inv.*;
 import com.glxp.api.entity.system.SyncDataBustypeEntity;
@@ -91,6 +93,8 @@ public class IoOrderServiceImpl implements IoOrderService {
     private ThrSystemDao thrSystemDao;
     @Resource
     private HttpOkClient httpOkClient;
+    @Resource
+    private BasicCorpDao basicCorpDao;
 
     @Override
     public List<IoOrderEntity> selectAll() {
@@ -540,15 +544,23 @@ public class IoOrderServiceImpl implements IoOrderService {
             //查询单据类型名称
             String busTypeName = basicBussinessTypeDao.selectNameByAction(order.getAction());
             response.setBillTypeName(busTypeName);
-            //查询往来单位名称  TODO  有bug
-//            BasicCorpEntity corpEntity = basicCorpDao.selectByErpId(order.getFromCorp());
-//            response.setFromName(corpEntity.getName());
+
             //查询部门名称
             String deptName = deptDao.selectNameByCode(order.getDeptCode());
             response.setDeptName(deptName);
             //查询仓库名称
             String invName = invWarehouseDao.selectNameByCode(order.getInvCode());
             response.setInvName(invName);
+
+            //查询往来单位名称
+            if (StrUtil.isNotBlank(order.getFromCorp())) {
+                BasicCorpEntity corpEntity = basicCorpDao.selectByErpId(order.getFromCorp());
+                response.setFromCorpName(corpEntity.getName());
+            } else if (StrUtil.isNotBlank(order.getFromInvCode())) {
+                String fromInvName = invWarehouseDao.selectNameByCode(order.getFromInvCode());
+                response.setFromCorpName(fromInvName);
+            }
+
             responseList.add(response);
         }
         return responseList;