1.干线提货单 节点列表添加

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<TrunklineBillladingWaybillVO> waybillList = new ArrayList<>();
 
+	private List<TrunklineBillladingLineVO> lineList = new ArrayList<>();
 
 }

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<TrunklineBillladingLineEntity> {
+
+    List<TrunklineBillladingLineVO> findListByBillladingId(@Param("billladingId") Long billladingId);
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingLineMapper.xml

@@ -2,5 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.logpm.trunkline.mapper.TrunklineBillladingLineMapper">
 
+    <select id="findListByBillladingId" resultType="com.logpm.trunkline.vo.TrunklineBillladingLineVO">
+        select *
+        from logpm_trunkline_billlading_line
+        where billlading_id = #{billladingId}
+        and is_deleted = 0
+    </select>
 
 </mapper>

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<TrunklineBillladingLineEntity> {
 
 	void deleteByBillladingId(Long billladingId);
+
+    List<TrunklineBillladingLineVO> findListByBillladingId(Long billladingId);
 }

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<Trunklin
 		queryWrapper.eq("billlading_id",billladingId);
 		baseMapper.delete(queryWrapper);
 	}
+
+	@Override
+	public List<TrunklineBillladingLineVO> findListByBillladingId(Long billladingId) {
+		return baseMapper.findListByBillladingId(billladingId);
+	}
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java

@@ -343,6 +343,10 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 		TrunklineBillladingVO trunklineBillladingVO = new TrunklineBillladingVO();
 		BeanUtil.copy(billladingEntity,trunklineBillladingVO);
 
+		List<TrunklineBillladingLineVO> lineList = billladingLineService.findListByBillladingId(billladingId);
+
+		trunklineBillladingVO.setLineList(lineList);
+
 		//查询提货单关联的运单信息
 		List<TrunklineBillladingWaybillVO> ls = billladingWaybillService.findWaybillInfoListByBillladingId(billladingId);