From d00db37b5fd930469bae71475292e1bd2ecf83b0 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 4 Jan 2024 17:50:38 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E6=8F=90=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=20=E8=8A=82=E7=82=B9=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/trunkline/vo/TrunklineBillladingVO.java | 1 + .../trunkline/mapper/TrunklineBillladingLineMapper.java | 7 +++++++ .../trunkline/mapper/TrunklineBillladingLineMapper.xml | 6 ++++++ .../service/ITrunklineBillladingLineService.java | 5 +++++ .../service/impl/TrunklineBillladingLineServiceImpl.java | 8 ++++++++ .../service/impl/TrunklineBillladingServiceImpl.java | 4 ++++ 6 files changed, 31 insertions(+) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingVO.java index 2572cf6b8..12b74b864 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingVO.java @@ -19,5 +19,6 @@ public class TrunklineBillladingVO extends TrunklineBillladingEntity { private List waybillList = new ArrayList<>(); + private List lineList = new ArrayList<>(); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingLineMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingLineMapper.java index 8e7b5fcab..43ca9d106 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingLineMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingLineMapper.java @@ -2,8 +2,15 @@ package com.logpm.trunkline.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.logpm.trunkline.entity.TrunklineBillladingLineEntity; +import com.logpm.trunkline.vo.TrunklineBillladingLineVO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; @Mapper public interface TrunklineBillladingLineMapper extends BaseMapper { + + List findListByBillladingId(@Param("billladingId") Long billladingId); + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingLineMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingLineMapper.xml index b9de6ea86..f2a6600ca 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingLineMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingLineMapper.xml @@ -2,5 +2,11 @@ + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingLineService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingLineService.java index 44cdf8073..a529203d8 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingLineService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingLineService.java @@ -1,9 +1,14 @@ package com.logpm.trunkline.service; import com.logpm.trunkline.entity.TrunklineBillladingLineEntity; +import com.logpm.trunkline.vo.TrunklineBillladingLineVO; import org.springblade.core.mp.base.BaseService; +import java.util.List; + public interface ITrunklineBillladingLineService extends BaseService { void deleteByBillladingId(Long billladingId); + + List findListByBillladingId(Long billladingId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingLineServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingLineServiceImpl.java index f736b835d..c5f50c00d 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingLineServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingLineServiceImpl.java @@ -4,11 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.logpm.trunkline.entity.TrunklineBillladingLineEntity; import com.logpm.trunkline.mapper.TrunklineBillladingLineMapper; import com.logpm.trunkline.service.ITrunklineBillladingLineService; +import com.logpm.trunkline.vo.TrunklineBillladingLineVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; + @Slf4j @AllArgsConstructor @Service @@ -20,4 +23,9 @@ public class TrunklineBillladingLineServiceImpl extends BaseServiceImpl findListByBillladingId(Long billladingId) { + return baseMapper.findListByBillladingId(billladingId); + } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java index 5d6e1adf6..d028556b3 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java @@ -343,6 +343,10 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl lineList = billladingLineService.findListByBillladingId(billladingId); + + trunklineBillladingVO.setLineList(lineList); + //查询提货单关联的运单信息 List ls = billladingWaybillService.findWaybillInfoListByBillladingId(billladingId);