From dbfacb048b11d1a925c121f0aa0df46c06889834 Mon Sep 17 00:00:00 2001
From: vayne <vayne0702@163.com>
Date: Wed, 31 Jul 2024 09:06:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jnpf/service/impl/WarehousingOutboundServiceImpl.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
index 1a961482..3ca1c629 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
@@ -95,6 +95,8 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
     private DeliveryRelationService deliveryRelationService;
     @Resource
     private ReceiptOrderService receiptOrderService;
+    @Autowired
+    private BusinessLineService businessLineService;
     @Override
     public List<WarehousingOutboundEntity> getList(WarehousingOutboundPagination warehousingOutboundPagination){
         return getTypeList(warehousingOutboundPagination,warehousingOutboundPagination.getDataType());
@@ -771,10 +773,13 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
                 if (ObjectUtil.isNotEmpty(businessOrderEntitySale)){
                     deliveryRelationEntity.setSaleCode(businessOrderEntitySale.getCode()); //订单
                     ContractLEntity contractLEntity = contractLService.getInfo(businessOrderEntitySale.getContractId());
+                    BusinessLineEntity businessLineEntity = businessLineService.getInfo(businessOrderEntitySale.getBusinessLineId());
                     if (ObjectUtil.isNotEmpty(contractLEntity)){
                         deliveryRelationEntity.setSaleContract(contractLEntity.getContractNumber()); //合同
                     }
-                    deliveryRelationEntity.setBusinessLine(businessOrderEntitySale.getBusinessLineId());//业务线
+                    if (ObjectUtil.isNotEmpty(businessLineEntity)) {
+                        deliveryRelationEntity.setBusinessLine(businessLineEntity.getName());//业务线
+                    }
                     SubjectbasicEntity subjectbasicEntity=subjectbasicService.getInfo(businessOrderEntitySale.getFirstSubjectBasicId());
                     if (ObjectUtil.isNotEmpty(subjectbasicEntity)){
                         deliveryRelationEntity.setCustomer(subjectbasicEntity.getName()); //客户