1.配送查看

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryInfoEntity.java

@@ -67,10 +67,10 @@ public class DistributionDeliveryInfoEntity extends TenantEntity {
 	@ApiModelProperty(value = "装车数量")
 	private Integer loadedNub;
 	/**
-	 * 预留3
+	 * 包条内数量
 	 */
-	@ApiModelProperty(value = "预留3")
-	private String reserve3;
+	@ApiModelProperty(value = "包条内数量")
+	private Integer packageNub;
 	/**
 	 * 预留4
 	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java

@@ -179,4 +179,12 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	@ApiModelProperty(value = "装车时间")
 	private String loadingTime;
 
+	/**
+	 * 配送单号
+	 */
+	@ApiModelProperty(value = "配送单号")
+	private String noteNumber;
+
+
+
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java

@@ -100,7 +100,7 @@ public class DistributionSignforEntity extends TenantEntity {
 	/**
 	 * 配送仓库(id)
 	 */
-	@ApiModelProperty(value = "配送仓库")
+	@ApiModelProperty(value = "配送仓库(id)")
 	private String warehouseId;
 	/**
 	 * 配送仓库(名称)

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java

@@ -16,11 +16,16 @@
  */
 package com.logpm.distribution.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.logpm.distribution.entity.DistributionDeliveryInfoEntity;
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * 配送装车中间表 视图实体类
  *
@@ -32,4 +37,161 @@ import lombok.EqualsAndHashCode;
 public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity {
 	private static final long serialVersionUID = 1L;
 
+
+	/**
+	 * 仓库
+	 */
+	@ApiModelProperty(value = "仓库")
+	private String warehouse;
+	/**
+	 * 状态
+	 */
+	@ApiModelProperty(value = "状态")
+	private Integer conditions;
+	/**
+	 * 包条码
+	 */
+	@ApiModelProperty(value = "包条码")
+	private String packetBarCode;
+	/**
+	 * 货位信息
+	 */
+	@ApiModelProperty(value = "货位信息")
+	private String goodsAllocation;
+	/**
+	 * 所在托盘
+	 */
+	@ApiModelProperty(value = "所在托盘")
+	private String pallet;
+	/**
+	 * 一级品
+	 */
+	@ApiModelProperty(value = "一级品")
+	private String firsts;
+	/**
+	 * 二级品
+	 */
+	@ApiModelProperty(value = "二级品")
+	private String second;
+	/**
+	 * 三级品
+	 */
+	@ApiModelProperty(value = "三级品")
+	private String thirdProduct;
+	/**
+	 * 物料
+	 */
+	@ApiModelProperty(value = "物料")
+	private String material;
+	/**
+	 * 数量
+	 */
+	@ApiModelProperty(value = "数量")
+	private Integer quantity;
+	/**
+	 * 车次号
+	 */
+	@ApiModelProperty(value = "车次号")
+	private String trainNumber;
+	/**
+	 * 在库订单ID
+	 */
+	@ApiModelProperty(value = "在库订单ID")
+	private String stockArticleId;
+
+
+
+
+	/**
+	 * 订单自编号;展示使用
+	 */
+	@ApiModelProperty(value = "订单自编号;订单自编号，关联订单表")
+	private String orderIds;
+	/**
+	 * 收货人
+	 */
+	@ApiModelProperty(value = "收货人")
+	private String consignee;
+	/**
+	 * 收件地址
+	 */
+	@ApiModelProperty(value = "收件地址")
+	private String deliveryAddress;
+	/**
+	 * 预约时间
+	 */
+	@ApiModelProperty(value = "预约时间")
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+	private Date reservationDate;
+	/**
+	 * 服务类型;预约服务类型；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；
+	 */
+	@ApiModelProperty(value = "服务类型;预约服务类型；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；")
+	private String serveType;
+	/**
+	 * 配送类型;预约添加送货方式；1-送货(商配的唯一方式)、2-送货上楼、3-送装一体、4-装
+	 */
+	@ApiModelProperty(value = "配送类型;预约添加送货方式；1-送货(商配的唯一方式)、2-送货上楼、3-送装一体、4-装")
+	private String deliveryType;
+	/**
+	 * 配送方式;预约添加送货方式；1-送货(商配的唯一方式)、2-送货上楼、3-送装一体、4-装
+	 */
+	@ApiModelProperty(value = "配送方式;1-商配、2-市配")
+	private String deliveryWay;
+	/**
+	 * 到付运费
+	 */
+	@ApiModelProperty(value = "到付运费")
+	private BigDecimal collectFee;
+	/**
+	 * 其他费用
+	 */
+	@ApiModelProperty(value = "其他费用")
+	private BigDecimal otherFee;
+	/**
+	 * 代付运费
+	 */
+	@ApiModelProperty(value = "代付运费")
+	private BigDecimal replaceFee;
+	/**
+	 * 收件人电话
+	 */
+	@ApiModelProperty(value = "收件人电话")
+	private String deliveryPhone;
+	/**
+	 * 预约信息状态;预约列表信息状态；1-待确认、2-已确认
+	 */
+	@ApiModelProperty(value = "预约信息状态;预约列表信息状态；1-待确认、2-已确认")
+	private String reservationStatus;
+	/**
+	 * 订单来源
+	 */
+	@ApiModelProperty(value = "订单来源")
+	private String orderSource;
+	/**
+	 * 备货状态;备货状态；1-未备货、2-待备货、3-已备货
+	 */
+	@ApiModelProperty(value = "备货状态;备货状态；1-未备货、2-待备货、3-已备货")
+	private String stockupStatus;
+	/**
+	 * 备货区编号
+	 */
+	@ApiModelProperty(value = "备货区编号")
+	private String goodsAreaId;
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String remarks;
+	/**
+	 * 预约单编号，系统构建生成
+	 */
+	@ApiModelProperty(value = "预约单编号")
+	private String reservationIds;
+	/**
+	 * 时段
+	 */
+	@ApiModelProperty(value = "时段;1-上午、2-下午、3-全天")
+	private String periodOfTime;
+
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java

@@ -38,7 +38,14 @@ public class DistributionDeliveryListVO extends DistributionDeliveryListEntity {
 	 * 包条数据
 	 */
 	@ApiModelProperty(value = "包条数据")
-	private List<DistributionPackadeliVO> packadeList;
+	private List<DistributionDeliveryInfoVO> packadeList;
+
+
+	/**
+	 * 预约客户数据
+	 */
+	@ApiModelProperty(value = "预约客户数据")
+	private List<DistributionDeliveryInfoVO> reservationList;
 
 
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionPackadeliVO.java

@@ -23,7 +23,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 配送包条中间表 视图实体类
+ * 签收包条中间表 视图实体类
  *
  * @author lmy
  * @since 2023-06-17
@@ -33,65 +33,5 @@ import lombok.EqualsAndHashCode;
 public class DistributionPackadeliVO extends DistributionPackadeliEntity {
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 仓库
-	 */
-	@ApiModelProperty(value = "仓库")
-	private String warehouse;
-	/**
-	 * 状态
-	 */
-	@ApiModelProperty(value = "状态")
-	private Integer conditions;
-	/**
-	 * 包条码
-	 */
-	@ApiModelProperty(value = "包条码")
-	private String packetBarCode;
-	/**
-	 * 货位信息
-	 */
-	@ApiModelProperty(value = "货位信息")
-	private String goodsAllocation;
-	/**
-	 * 所在托盘
-	 */
-	@ApiModelProperty(value = "所在托盘")
-	private String pallet;
-	/**
-	 * 一级品
-	 */
-	@ApiModelProperty(value = "一级品")
-	private String firsts;
-	/**
-	 * 二级品
-	 */
-	@ApiModelProperty(value = "二级品")
-	private String second;
-	/**
-	 * 三级品
-	 */
-	@ApiModelProperty(value = "三级品")
-	private String thirdProduct;
-	/**
-	 * 物料
-	 */
-	@ApiModelProperty(value = "物料")
-	private String material;
-	/**
-	 * 数量
-	 */
-	@ApiModelProperty(value = "数量")
-	private Integer quantity;
-	/**
-	 * 车次号
-	 */
-	@ApiModelProperty(value = "车次号")
-	private String trainNumber;
-	/**
-	 * 在库订单ID
-	 */
-	@ApiModelProperty(value = "在库订单ID")
-	private String stockArticleId;
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java

@@ -18,7 +18,10 @@ package com.logpm.distribution.controller;
 
 import cn.hutool.core.util.BooleanUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.logpm.distribution.dto.DistributionDeliveryInfoDTO;
 import com.logpm.distribution.dto.DistributionDeliveryListDTO;
+import com.logpm.distribution.service.IDistributionDeliveryInfoService;
+import com.logpm.distribution.vo.DistributionDeliveryInfoVO;
 import com.logpm.distribution.vo.DistributionstatisticsnmbVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -63,6 +66,8 @@ public class DistributionDeliveryListController extends BladeController {
 
 	private final IDistributionDeliveryListService distributionDeliveryListService;
 
+	private final IDistributionDeliveryInfoService distributionDeliveryInfoService;
+
 	/**
 	 * 配送管理 详情
 	 */
@@ -74,6 +79,17 @@ public class DistributionDeliveryListController extends BladeController {
 		DistributionDeliveryListVO distributionDeliveryListVO = distributionDeliveryListService.getdetailVO(detail);
 		return R.data(distributionDeliveryListVO);
 	}
+
+	/**
+	 * 查看包间明细 详情
+	 */
+	@GetMapping("/wrapdetail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查看包间详情", notes = "传入distributionDeliveryList")
+	public R<IPage<DistributionDeliveryInfoVO>> wrapdetail(DistributionDeliveryInfoDTO distributionDeliveryInfoDTO, Query query) {
+		IPage<DistributionDeliveryInfoVO> pages = distributionDeliveryInfoService.selectDistributionDeliveryInfowrapPage(Condition.getPage(query), distributionDeliveryInfoDTO);
+		return R.data(pages);
+	}
 	/**
 	 * 配送管理 分页
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.mapper;
 
+import com.logpm.distribution.dto.DistributionDeliveryInfoDTO;
 import com.logpm.distribution.entity.DistributionDeliveryInfoEntity;
 import com.logpm.distribution.vo.DistributionDeliveryInfoVO;
 import com.logpm.distribution.excel.DistributionDeliveryInfoExcel;
@@ -50,5 +51,35 @@ public interface DistributionDeliveryInfoMapper extends BaseMapper<DistributionD
 	 * @return
 	 */
 	List<DistributionDeliveryInfoExcel> exportDistributionDeliveryInfo(@Param("ew") Wrapper<DistributionDeliveryInfoEntity> queryWrapper);
-
+	/**
+	 * 通过客户查询已经上车的订单
+	 *
+	 * @return
+	 */
+    String selectorderIdList(Long id);
+	/**
+	 * 通过配送查询包条
+	 *
+	 * @return
+	 */
+	List<DistributionDeliveryInfoVO> selectStripList(Long id);
+	/**
+	 * 通过配送查询客户
+	 *
+	 * @return
+	 */
+	List<DistributionDeliveryInfoVO> selectcustomList(Long id);
+	/**
+	 * 从预约客户查询包条自定义分页
+	 * @param page
+	 * @param distributionDeliveryInfoDTO
+	 * @return
+	 */
+	List<DistributionDeliveryInfoVO> selectDistributionDeliverywrapInfoPage(IPage page,@Param("param") DistributionDeliveryInfoDTO distributionDeliveryInfoDTO);
+	/**
+	 * 通过客户查询包条数量
+	 * @param id
+	 * @return
+	 */
+	Integer selectWrapCount(Long id);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml

@@ -15,9 +15,9 @@
         <result column="create_dept" property="createDept"/>
         <result column="reservation_id" property="reservationId"/>
         <result column="delivery_id" property="deliveryId"/>
-        <result column="reserve1" property="reserve1"/>
-        <result column="reserve2" property="reserve2"/>
-        <result column="reserve3" property="reserve3"/>
+        <result column="loaded_state" property="loadedState"/>
+        <result column="loaded_nub" property="loadedNub"/>
+        <result column="package_nub" property="packageNub"/>
         <result column="reserve4" property="reserve4"/>
         <result column="reserve5" property="reserve5"/>
     </resultMap>
@@ -31,5 +31,82 @@
     <select id="exportDistributionDeliveryInfo" resultType="com.logpm.distribution.excel.DistributionDeliveryInfoExcel">
         SELECT * FROM logpm_distribution_delivery_info ${ew.customSqlSegment}
     </select>
+    <select id="selectorderIdList" resultType="java.lang.String">
+        select GROUP_CONCAT(order_id SEPARATOR ',') from logpm_distribution_delivery_info where is_deleted = 0 and reservation_id = #{id}
+    </select>
+    <select id="selectStripList" resultType="com.logpm.distribution.vo.DistributionDeliveryInfoVO">
+        SELECT
+            ldpl.warehouse warehouse,
+            ldpl.conditions conditions,
+            ldpl.packet_bar_code packetBarCode,
+            ldpl.goods_allocation goodsAllocation,
+            ldpl.pallet pallet,
+            ldpl.firsts firsts,
+            ldpl.second second,
+            ldpl.third_product thirdProduct,
+            ldpl.material material,
+            ldpl.quantity quantity,
+            ldpl.train_number trainNumber,
+            ldpl.stock_article_id stockArticleId,
+            lddi.loaded_state loadedState,
+            lddi.package_nub packageNub,
+            lddi.loaded_nub loadedNub
+        FROM
+            logpm_distribution_delivery_info lddi
+                JOIN logpm_distribution_parcel_list ldpl ON lddi.package_id = ldpl.id
+        <where>
+            lddi.is_deleted = 0 and lddi.delivery_id = #{id}
+        </where>
+    </select>
+    <select id="selectcustomList" resultType="com.logpm.distribution.vo.DistributionDeliveryInfoVO">
+        SELECT
+        ldr.consignee consignee,
+        ldr.delivery_address deliveryAddress,
+        ldr.delivery_phone deliveryPhone,
+        ldr.order_id orderIds,
+        COALESCE(COUNT(lddi.package_nub), 0) packageNub,
+        COALESCE(COUNT(lddi.loaded_nub), 0)  loadedNub
+        FROM
+        logpm_distribution_delivery_info lddi
+        JOIN logpm_distribution_reservation ldr ON lddi.reservation_id = ldr.id
+        <where>
+            lddi.is_deleted = 0 and lddi.delivery_id = #{id}
+        </where>
+        GROUP BY lddi.reservation_id
+    </select>
+    <select id="selectDistributionDeliverywrapInfoPage" resultType="com.logpm.distribution.vo.DistributionDeliveryInfoVO">
+        SELECT
+            ldpl.warehouse warehouse,
+            ldpl.conditions conditions,
+            ldpl.packet_bar_code packetBarCode,
+            ldpl.goods_allocation goodsAllocation,
+            ldpl.pallet pallet,
+            ldpl.firsts firsts,
+            ldpl.second second,
+            ldpl.third_product thirdProduct,
+            ldpl.material material,
+            ldpl.quantity quantity,
+            ldpl.train_number trainNumber,
+            ldpl.stock_article_id stockArticleId,
+            lddi.loaded_state loadedState,
+            lddi.package_nub packageNub,
+            lddi.loaded_nub loadedNub
+        FROM
+            logpm_distribution_delivery_info lddi
+                JOIN logpm_distribution_parcel_list ldpl ON lddi.package_id = ldpl.id
+        <where>
+            lddi.is_deleted = 0 and lddi.reservation_id = #{param.reservationId}
+        </where>
+    </select>
+    <select id="selectWrapCount" resultType="java.lang.Integer">
+        SELECT
+        count(*)
+        FROM
+        logpm_distribution_delivery_info lddi
+        <where>
+            lddi.is_deleted = 0 and lddi.reservation_id = #{id}
+        </where>
+    </select>
+
 
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@@ -19,11 +19,14 @@
         <result column="reserve4" property="reserve4"/>
         <result column="reserve5" property="reserve5"/>
         <result column="train_number" property="trainNumber"/>
-        <result column="warehouse" property="warehouse"/>
+        <result column="warehouse_id" property="warehouseId"/>
+        <result column="warehouse_name" property="warehouseName"/>
         <result column="type" property="type"/>
         <result column="kind" property="kind"/>
-        <result column="vehicle" property="vehicle"/>
-        <result column="driver" property="driver"/>
+        <result column="vehicle_name" property="vehicleName"/>
+        <result column="vehicle_id" property="vehicleId"/>
+        <result column="driver_id" property="driverId"/>
+        <result column="driver_name" property="driverName"/>
         <result column="distribution_company" property="distributionCompany"/>
         <result column="state" property="state"/>
         <result column="customers_number" property="customersNumber"/>
@@ -32,7 +35,8 @@
         <result column="order_number" property="orderNumber"/>
         <result column="delivery_number" property="deliveryNumber"/>
         <result column="scanned_number" property="scannedNumber"/>
-        <result column="loading_team" property="loadingTeam"/>
+        <result column="loading_team_id" property="loadingTeamId"/>
+        <result column="loading_team_name" property="loadingTeamName"/>
         <result column="reservation_id" property="reservationId"/>
     </resultMap>
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryInfoService.java

@@ -17,6 +17,7 @@
 package com.logpm.distribution.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.distribution.dto.DistributionDeliveryInfoDTO;
 import com.logpm.distribution.entity.DistributionDeliveryInfoEntity;
 import com.logpm.distribution.vo.DistributionDeliveryInfoVO;
 import com.logpm.distribution.excel.DistributionDeliveryInfoExcel;
@@ -48,5 +49,12 @@ public interface IDistributionDeliveryInfoService extends BaseService<Distributi
 	 * @return
 	 */
 	List<DistributionDeliveryInfoExcel> exportDistributionDeliveryInfo(Wrapper<DistributionDeliveryInfoEntity> queryWrapper);
-
+	/**
+	 * 从预约客户查询包条自定义分页
+	 *
+	 * @param page
+	 * @param distributionDeliveryInfoDTO
+	 * @return
+	 */
+	IPage<DistributionDeliveryInfoVO> selectDistributionDeliveryInfowrapPage(IPage<DistributionDeliveryInfoVO> page, DistributionDeliveryInfoDTO distributionDeliveryInfoDTO);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.service.impl;
 
+import com.logpm.distribution.dto.DistributionDeliveryInfoDTO;
 import com.logpm.distribution.entity.DistributionDeliveryInfoEntity;
 import com.logpm.distribution.vo.DistributionDeliveryInfoVO;
 import com.logpm.distribution.excel.DistributionDeliveryInfoExcel;
@@ -38,7 +39,8 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
 
 	@Override
 	public IPage<DistributionDeliveryInfoVO> selectDistributionDeliveryInfoPage(IPage<DistributionDeliveryInfoVO> page, DistributionDeliveryInfoVO distributionDeliveryInfo) {
-		return page.setRecords(baseMapper.selectDistributionDeliveryInfoPage(page, distributionDeliveryInfo));
+		List<DistributionDeliveryInfoVO> distributionDeliveryInfoVOS = baseMapper.selectDistributionDeliveryInfoPage(page, distributionDeliveryInfo);
+		return page.setRecords(distributionDeliveryInfoVOS);
 	}
 
 
@@ -51,4 +53,10 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
 		return distributionDeliveryInfoList;
 	}
 
+	@Override
+	public IPage<DistributionDeliveryInfoVO> selectDistributionDeliveryInfowrapPage(IPage<DistributionDeliveryInfoVO> page, DistributionDeliveryInfoDTO distributionDeliveryInfoDTO) {
+		List<DistributionDeliveryInfoVO> distributionDeliveryInfoVOS = baseMapper.selectDistributionDeliverywrapInfoPage(page, distributionDeliveryInfoDTO);
+		return page.setRecords(distributionDeliveryInfoVOS);
+	}
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -21,14 +21,12 @@ import com.logpm.distribution.dto.DistributionDeliveryListDTO;
 import com.logpm.distribution.dto.DistributionSignforDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.mapper.*;
-import com.logpm.distribution.vo.DistributionDeliveryListVO;
+import com.logpm.distribution.vo.*;
 import com.logpm.distribution.excel.DistributionDeliveryListExcel;
 import com.logpm.distribution.service.IDistributionDeliveryListService;
-import com.logpm.distribution.vo.DistributionPackadeliVO;
-import com.logpm.distribution.vo.DistributionSignforVO;
-import com.logpm.distribution.vo.DistributionstatisticsnmbVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -41,6 +39,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigInteger;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -80,8 +79,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//转移数据到VO上
 		BeanUtils.copyProperties(detail, distributionDeliveryListVO);
 		//查询包条数据
-		List<DistributionPackadeliVO> list = distributionPackadeliMapper.selectjointList(detail.getId());
-		distributionDeliveryListVO.setPackadeList(list);
+		List<DistributionDeliveryInfoVO> stripList =	distributionDeliveryInfoMapper.selectStripList(detail.getId());
+		//查询客户信息
+		List<DistributionDeliveryInfoVO> customList = distributionDeliveryInfoMapper.selectcustomList(detail.getId());
+		distributionDeliveryListVO.setPackadeList(stripList);
+		distributionDeliveryListVO.setReservationList(customList);
+//		List<DistributionPackadeliVO> list = distributionPackadeliMapper.selectjointList(detail.getId());
+//		distributionDeliveryListVO.setPackadeList(list);
 		return distributionDeliveryListVO;
 	}
 
@@ -120,19 +124,42 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		String reservationId = distributionDeliveryList.getReservationId();
 		List<Long> reservationIds = Arrays.asList(Long.valueOf(String.valueOf(reservationId.split(","))));
 		//查询客户信息,装车情况
-		List<DistributionDeliveryInfoEntity> distributionDeliveryInfoEntities = distributionDeliveryInfoMapper.selectList(new QueryWrapper<DistributionDeliveryInfoEntity>().lambda()
-			.eq(DistributionDeliveryInfoEntity::getLoadedState, "2")
-			.in(null != reservationIds && reservationIds.size() > 0, DistributionDeliveryInfoEntity::getReservationId, reservationIds)
-		);
+//		List<DistributionDeliveryInfoEntity> distributionDeliveryInfoEntities = distributionDeliveryInfoMapper.selectList(new QueryWrapper<DistributionDeliveryInfoEntity>().lambda()
+//			.eq(DistributionDeliveryInfoEntity::getLoadedState, "2")
+//			.in(null != reservationIds && reservationIds.size() > 0, DistributionDeliveryInfoEntity::getReservationId, reservationIds)
+//		);
 		//统计客户的配送数量,加入签收表(通过预约单查询总数量)
 		List<DistributionReservationEntity> distributionReservationEntities = distributionReservationMapper.selectBatchIds(reservationIds);
-		DistributionSignforVO distributionSignforVO = new DistributionSignforVO();
+		ArrayList<DistributionSignforEntity> distributionSignforEntities = new ArrayList<DistributionSignforEntity>();
+		//TODO 冗余加入签收表
+		distributionReservationEntities.forEach(e->{
+			DistributionSignforEntity distributionSignforEntity = new DistributionSignforEntity();
+			BeanUtils.copyProperties(e,distributionSignforEntity);
+			distributionSignforEntity.setReservationId(e.getId());
+			distributionSignforEntity.setConsigneeName(e.getConsignee());
+			distributionSignforEntity.setWarehouseId(distributionDeliveryList.getWarehouseId());
+			distributionSignforEntity.setWarehouseName(distributionDeliveryList.getWarehouseName());
+			distributionSignforEntity.setTrainNumber(distributionDeliveryList.getTrainNumber());
+			//通过客户查询已经上车的订单
+			String orderIds  = distributionDeliveryInfoMapper.selectorderIdList(e.getId());
+			distributionSignforEntity.setOrderId(orderIds);
+			//查询订单总数
+			Integer i = StringUtils.countMatches(e.getOrderId(), ",")+1;
+			distributionSignforEntity.setOrderTotal(i);
+			//该客户总件数
+		  	Integer i1 =distributionDeliveryInfoMapper.selectWrapCount(e.getId());
+			  distributionSignforEntity.setTotal(i1);
+			  //装车件数
+			
+			distributionSignforEntities.add(distributionSignforEntity);
+		});
 
 		//插入配送管理表
 
 		//获取关联订单
 		String orderId = distributionDeliveryList.getOrderId();
 		List<Long> orderIds = Arrays.asList(Long.valueOf(String.valueOf(orderId.split(","))));
+		//TODO 修改配送表id
 		return null;
 	}