修改

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()); //客户