1.工单创建的时候带出干线和配送的数据

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesAbnormalPackageVO.java

@@ -21,6 +21,8 @@ import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 异常处理包件记录 视图实体类
  *
@@ -45,8 +47,9 @@ public class AftersalesAbnormalPackageVO extends AftersalesAbnormalPackageEntity
 	private String second; //二级品
 	private String mallName; //客户名称
 	private Long mallId; //客户ID
+	List<AftersalesTrunklineVO> trunklines;  // 干线的信息列表
+	List<AftersalesDeliverVO>  deliver;  // 配送的信息列表
 	private String typeServiceName; //客户服务类型名称
-
-
+//	String orderPackageCode;  // 订单包件编码
 
 }

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesDeliverVO.java

@@ -0,0 +1,12 @@
+package com.logpm.aftersales.vo;
+
+import lombok.Data;
+
+@Data
+public class AftersalesDeliverVO {
+
+	private String trainNumber;  //车次号
+	private String loadingTime; //配送时间
+	private String driverName;  //配送司机
+	private String vehicleName; //车牌
+}

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesTrunklineVO.java

@@ -0,0 +1,10 @@
+package com.logpm.aftersales.vo;
+
+import lombok.Data;
+
+@Data
+public class AftersalesTrunklineVO {
+
+	private String trainNumber; //	车次号
+	private String vehicleRoute;  // 车辆路线
+}

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.java

@@ -22,6 +22,8 @@ import com.logpm.aftersales.excel.AftersalesAbnormalPackageExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.aftersales.vo.AftersalesDeliverVO;
+import com.logpm.aftersales.vo.AftersalesTrunklineVO;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
@@ -57,4 +59,6 @@ public interface AftersalesAbnormalPackageMapper extends BaseMapper<AftersalesAb
 	 * @return
 	 */
     List<AftersalesAbnormalPackageVO> getAbnormalPackage(@Param("param") AftersalesAbnormalPackageEntity aftersalesAbnormalPackageEntity);
+	List<AftersalesTrunklineVO> getTrunklines(@Param("orderPackageCode")  String orderPackageCode);
+	List<AftersalesDeliverVO> getDeliver(@Param("orderPackageCode")  String orderPackageCode);
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml

@@ -49,5 +49,21 @@
             <if test="param.warehouseId != null and param.warehouseId != ''"> and ldpl.warehouse_id =#{param.warehouseId } </if>
         </where>
     </select>
+    <select id="getTrunklines" resultType="com.logpm.aftersales.vo.AftersalesTrunklineVO">
+        SELECT ltcl.cars_line_name vehicleRoute , ltcls.load_code as trainNumber
+        FROM logpm_trunkline_cars_load_scan ltcls
+                 LEFT JOIN logpm_trunkline_cars_load ltcl ON ltcl.id = ltcls.load_id
+        where ltcls.scan_code = #{orderPackageCode}
+    </select>
+    <select id="getDeliver" resultType="com.logpm.aftersales.vo.AftersalesDeliverVO">
+        SELECT
+            lddl.train_number,lddl.vehicle_name,lddl.loading_time,lddl.driver_name
+        FROM
+            logpm_distribution_reservation_package AS ldrp
+                LEFT JOIN logpm_distribution_reservation AS ldr ON ldrp.reservation_id = ldr.id
+                LEFT JOIN logpm_distribution_signfor AS lds ON ldr.id = lds.reservation_id
+                LEFT JOIN logpm_distribution_delivery_list AS lddl ON lddl.id = lds.delivery_id
+        where ldrp.packet_bar_status in (1,3) and ldrp.packet_bar_code = #{orderPackageCode}
+    </select>
 
 </mapper>

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalPackageServiceImpl.java

@@ -23,6 +23,7 @@ import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import com.logpm.aftersales.excel.AftersalesAbnormalPackageExcel;
 import com.logpm.aftersales.mapper.AftersalesAbnormalPackageMapper;
 import com.logpm.aftersales.service.IAftersalesAbnormalPackageService;
+import com.logpm.aftersales.vo.AftersalesTrunklineVO;
 import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataClientClient;
@@ -81,10 +82,17 @@ public class AftersalesAbnormalPackageServiceImpl extends BaseServiceImpl<Afters
 		if(ObjectUtils.isNotNull(myCurrentWarehouse)){
 			aftersalesAbnormalPackageEntity.setWarehouseId(myCurrentWarehouse.getId());
 		}
+
 		List<AftersalesAbnormalPackageVO> abnormalPackage = baseMapper.getAbnormalPackage(aftersalesAbnormalPackageEntity);
 		abnormalPackage.forEach(i ->{
+			if (ObjectUtils.isNotNull(i.getPackageCode())){
+				i.setTrunklines( baseMapper.getTrunklines(i.getPackageCode()));
+				i.setDeliver(baseMapper.getDeliver(i.getPackageCode()));
+			}
+			//i.setDeliver(baseMapper.getDeliver(aftersalesAbnormalPackageEntity.getPackageCode()));
 			//查询客户合作信息
 			if(ObjectUtils.isNotNull(i.getMallId())){
+
 				List<BasicdataStoreBusinessEntity> byClientIdList = basicdataStoreBusinessClient.findByClientIdList(i.getMallId());
 				if(!byClientIdList.isEmpty()){
 					StringBuffer stringBu = new StringBuffer();