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;