diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
index 8a2e34543..5e56103e9 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
@@ -98,6 +98,16 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "配送司机(id)")
 	private String driverId;
+	/**
+	 * 叉车司机(id)
+	 */
+	@ApiModelProperty(value = "叉车司机(id)")
+	private String forkliftId;
+	/**
+	 * 叉车司机(值)
+	 */
+	@ApiModelProperty(value = "叉车司机(值)")
+	private String forkliftName;
 	/**
 	 * 配送车辆(名称)
 	 */
@@ -158,6 +168,11 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "装卸班组(名称)")
 	private String loadingTeamName;
+	/**
+	 * 装卸类型
+	 */
+	@ApiModelProperty(value = "装卸类型(1-装,2-卸)")
+	private Integer loadingTeamType;
 	/**
 	 * 关联预约表id（客户）
 	 */
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java
index b8f0da70a..1bd5cccb1 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java
@@ -93,11 +93,11 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity {
 	 */
 	@ApiModelProperty(value = "车次号")
 	private String trainNumber;
-	/**
-	 * 在库订单ID
-	 */
-	@ApiModelProperty(value = "在库订单ID")
-	private String stockArticleId;
+//	/**
+//	 * 在库订单ID
+//	 */
+//	@ApiModelProperty(value = "在库订单ID")
+//	private String stockArticleId;
 
 
 
@@ -106,7 +106,7 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity {
 	 * 订单自编号;展示使用
 	 */
 	@ApiModelProperty(value = "订单自编号;订单自编号，关联订单表")
-	private String orderIds;
+	private String stockArticleId;
 	/**
 	 * 收货人
 	 */
@@ -183,11 +183,11 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity {
 	 */
 	@ApiModelProperty(value = "备注")
 	private String remarks;
-	/**
-	 * 预约单编号，系统构建生成
-	 */
-	@ApiModelProperty(value = "预约单编号")
-	private String reservationIds;
+//	/**
+//	 * 预约单编号，系统构建生成
+//	 */
+//	@ApiModelProperty(value = "预约单编号")
+//	private String reservationId;
 	/**
 	 * 时段
 	 */
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
index 701facf89..1e7768894 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
@@ -31,6 +31,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -63,6 +64,7 @@ import javax.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 @RequestMapping("/deliveryList")
 @Api(value = "配送管理", tags = "配送管理接口")
+@Slf4j
 public class DistributionDeliveryListController extends BladeController {
 
 	private final IDistributionDeliveryListService distributionDeliveryListService;
@@ -104,7 +106,7 @@ public class DistributionDeliveryListController extends BladeController {
 
 
 	/**
-	 * 配送管理 配送车次统计
+	 * 配送车次统计
 	 */
 	@GetMapping("/statistics")
 	@ApiOperationSupport(order = 2)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java
index b28c7855d..c45d81353 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java
@@ -82,4 +82,10 @@ public interface DistributionDeliveryInfoMapper extends BaseMapper<DistributionD
 	 * @return
 	 */
 	Integer selectWrapCount(Long id);
+	/**
+	 * 通过配送查询订单
+	 *
+	 * @return
+	 */
+	List<DistributionDeliveryInfoVO> selectcustomListByOrderId(String orderId);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
index 6fa4ea869..bf4fdea87 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
@@ -48,14 +48,13 @@
             ldpl.quantity quantity,
             ldpl.train_number trainNumber,
             ldpl.stock_article_id stockArticleId,
-            lddi.loaded_state loadedState,
-            lddi.package_nub packageNub,
-            lddi.loaded_nub loadedNub
+            ldl.package_nub packageNub,
+            ldl.loaded_nub loadedNub
         FROM
-            logpm_distribution_delivery_info lddi
-                JOIN logpm_distribution_parcel_list ldpl ON lddi.package_id = ldpl.id
+        logpm_distribution_loadscan ldl
+                JOIN logpm_distribution_parcel_list ldpl ON ldl.package_id = ldpl.id
         <where>
-            lddi.is_deleted = 0 and lddi.delivery_id = #{id}
+            ldl.is_deleted = 0 and ldl.delivery_id = #{id}
         </where>
     </select>
     <select id="selectcustomList" resultType="com.logpm.distribution.vo.DistributionDeliveryInfoVO">
@@ -63,16 +62,16 @@
         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
+        ldr.stock_article_id orderIds,
+        COALESCE(COUNT(ldl.package_nub), 0) packageNub,
+        COALESCE(COUNT(ldl.loaded_nub), 0)  loadedNub
         FROM
-        logpm_distribution_delivery_info lddi
-        JOIN logpm_distribution_reservation ldr ON lddi.reservation_id = ldr.id
+        logpm_distribution_loadscan ldl
+        JOIN logpm_distribution_reservation ldr ON ldl.reservation_id = ldr.id
         <where>
-            lddi.is_deleted = 0 and lddi.delivery_id = #{id}
+            ldl.is_deleted = 0 and ldl.delivery_id = #{id}
         </where>
-        GROUP BY lddi.reservation_id
+        GROUP BY ldl.reservation_id
     </select>
     <select id="selectDistributionDeliverywrapInfoPage" resultType="com.logpm.distribution.vo.DistributionDeliveryInfoVO">
         SELECT
@@ -107,6 +106,22 @@
             lddi.is_deleted = 0 and lddi.reservation_id = #{id}
         </where>
     </select>
+    <select id="selectcustomListByOrderId" resultType="com.logpm.distribution.vo.DistributionDeliveryInfoVO">
+        SELECT
+        ldsa.customer_name consignee,
+        ldsa.customer_address deliveryAddress,
+        ldsa.customer_telephone deliveryPhone,
+        ldsa.id orderIds,
+        COALESCE(COUNT(ldl.package_nub), 0) packageNub,
+        COALESCE(COUNT(ldl.loaded_nub), 0)  loadedNub
+        FROM
+        logpm_distribution_loadscan ldl
+        JOIN logpm_distribution_stock_article ldsa ON ldl.order_id = ldsa.id
+        <where>
+            ldl.is_deleted = 0 and ldl.order_id = #{id}
+        </where>
+        GROUP BY ldl.order_id
+    </select>
 
 
 </mapper>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
index 9778a4d7f..d12fcac22 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
@@ -74,5 +74,11 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
 	 *
 	 * @return
 	 */
-	Integer selectmarketTotal(DistributionDeliveryListDTO distributionDeliveryList);
+	Integer selectmarketTotal(@Param("param") DistributionDeliveryListDTO distributionDeliveryList);
+	/**
+	 * 更新上车时间
+	 *
+	 * @return
+	 */
+	Integer updateloadingTime(Long id);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
index da0fd95c1..5e73abc2c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
@@ -39,6 +39,12 @@
         <result column="loading_team_name" property="loadingTeamName"/>
         <result column="reservation_id" property="reservationId"/>
     </resultMap>
+    <update id="updateloadingTime">
+        UPDATE logpm_distribution_delivery_list lddl
+            JOIN logpm_distribution_loadscan ldl ON lddl.id = ldl.delivery_id
+            SET lddl.loading_time = now()
+             WHERE  ldl.package_id = #{id} and lddl.loading_time is null
+    </update>
 
 
     <select id="selectDistributionDeliveryListPage" resultType="com.logpm.distribution.vo.DistributionDeliveryListVO">
@@ -105,7 +111,7 @@
         SELECT * FROM logpm_distribution_delivery_list ${ew.customSqlSegment}
     </select>
     <select id="selectBycommercialNub" resultType="java.lang.Integer">
-        SELECT  COALESCE(COUNT(1), 0) FROM logpm_distribution_delivery_list
+        SELECT  COALESCE(COUNT(*), 0) FROM logpm_distribution_delivery_list
         <where>
              type = '2'
             <if test="param.warehouseName != null and param.warehouseName!=''">
@@ -133,12 +139,10 @@
     </select>
     <select id="selectcommercialTotal" resultType="java.lang.Integer">
         SELECT COALESCE
-                   ( COUNT( 1 ), 0 )
+                   ( COUNT(*), 0 )
         FROM
             logpm_distribution_delivery_list lddl
                 JOIN logpm_distribution_loadscan ldl ON lddl.id = ldl.delivery_id
-                JOIN logpm_distribution_parcel_list ldpl ON ldpl.id = ldl.package_id
-        WHERE
         <where>
             lddl.type = '2'
             <if test="param.warehouseName != null and param.warehouseName!=''">
@@ -165,7 +169,7 @@
         </where>
     </select>
     <select id="selectmarketNub" resultType="java.lang.Integer">
-        SELECT  COALESCE(COUNT(1), 0) FROM logpm_distribution_delivery_list
+        SELECT  COALESCE(COUNT(*), 0) FROM logpm_distribution_delivery_list
         <where>
             type = '1'
             <if test="param.warehouseName != null and param.warehouseName!=''">
@@ -193,12 +197,11 @@
     </select>
     <select id="selectmarketTotal" resultType="java.lang.Integer">
         SELECT COALESCE
-        ( COUNT( 1 ), 0 )
+        (COUNT(*), 0 )
         FROM
         logpm_distribution_delivery_list lddl
         JOIN logpm_distribution_loadscan ldl ON lddl.id = ldl.delivery_id
-        JOIN logpm_distribution_parcel_list ldpl ON ldpl.id = ldl.package_id
-        WHERE
+
         <where>
             lddl.type = '1'
             <if test="param.warehouseName != null and param.warehouseName!=''">
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index e43408123..bd269db62 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -58,6 +58,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	private final DistributionReservationMapper distributionReservationMapper;
 	private final DistributionParcelListMapper distributionParcelListMapper;
 	private final DistributionLoadscanMapper distributionLoadscanMapper;
+	private final DistributionDeliveryListMapper distributionDeliveryListMapper;
+	private final DistributionStockArticleMapper distributionStockArticleMapper;
 
 	@Override
 	public IPage<DistributionDeliveryListVO> selectDistributionDeliveryListPage(IPage<DistributionDeliveryListVO> page, DistributionDeliveryListDTO distributionDeliveryList) {
@@ -86,13 +88,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//转移数据到VO上
 		BeanUtils.copyProperties(detail, distributionDeliveryListVO);
 		//查询包条数据
-		List<DistributionDeliveryInfoVO> stripList =	distributionDeliveryInfoMapper.selectStripList(detail.getId());
+		List<DistributionDeliveryInfoVO> stripList =distributionDeliveryInfoMapper.selectStripList(detail.getId());
+		distributionDeliveryListVO.setPackadeList(stripList);
+		if (detail.getSource()==1){
 		//查询客户信息
 		List<DistributionDeliveryInfoVO> customList = distributionDeliveryInfoMapper.selectcustomList(detail.getId());
-		distributionDeliveryListVO.setPackadeList(stripList);
 		distributionDeliveryListVO.setReservationList(customList);
-//		List<DistributionPackadeliVO> list = distributionPackadeliMapper.selectjointList(detail.getId());
-//		distributionDeliveryListVO.setPackadeList(list);
+		}else if (detail.getSource()==2){
+			//查询订单信息
+			List<DistributionDeliveryInfoVO> customList = distributionDeliveryInfoMapper.selectcustomListByOrderId(detail.getOrderId());
+			distributionDeliveryListVO.setReservationList(customList);
+		}
 		return distributionDeliveryListVO;
 	}
 
@@ -176,7 +182,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 	@Override
 	public Integer loadingscan(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
-
 		if (distrilbutionloadingscanDTO.getType()==1){
 		//找出该包条码
 		List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListMapper.selectList(new QueryWrapper<DistributionParcelListEntity>().lambda()
@@ -185,11 +190,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//修改对应的装车表
 		distributionLoadscanMapper.updateByPackageId(e.getId());
 		//TODO 查询本车次是否第一次扫码,没有则更新上车时间
-
+		Integer i =	distributionDeliveryListMapper.updateloadingTime(e.getId());
 		//	baseMapper.updateloadingTime(e.getId());
 		});
 		}else if (distrilbutionloadingscanDTO.getType()==2){
-
+		//TODO 托盘扫描
 		}
 		return 1;
 	}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
index 7f095b8d2..6790e929a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
@@ -112,59 +112,59 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	@Override
 	@Transactional
 	public boolean insertReservation(DistributionReservationDTO distributionReservationDTO) {
-		try {
-			if (Func.isEmpty(distributionReservationDTO)) {
-				log.error("参数错误+{" + distributionReservationDTO + "}");
-				return false;
-			}
-			//这里新增需要对预约列表下的订单配送单的金额进行计算
-			String idsStr = distributionReservationDTO.getIds();
-			List<Long> ids = Func.toLongList(idsStr);
-			if (Func.isEmpty(ids)) {
-				log.error("ids参数错误:+{" + ids + "}");
-				return false;
-			}
-			BigDecimal collectFee = new BigDecimal("0");
-			BigDecimal replaceFee = new BigDecimal("0");
-			StringBuffer buffer = new StringBuffer();
-			List<DistributionStockArticleEntity> deliveryEntities = new ArrayList<>();
-			for (int i = 0; i < ids.size(); i++) {
-				BaseMapper<DistributionStockArticleEntity> stockArticleMapper = distributionStockArticleService.getBaseMapper();
-				DistributionStockArticleEntity distributionStockArticleEntity = stockArticleMapper.selectById(ids.get(i));
-//				deliveryEntities.add(distributionDeliveryEntity);
-//				collectFee = collectFee.add(distributionDeliveryEntity.getCollectFee());
-//				//待收货款累加
-//				replaceFee = replaceFee.add(distributionDeliveryEntity.getReplaceFee());
-//				String orderId = distributionDeliveryEntity.getOrderId();
-				buffer.append(distributionStockArticleEntity.getId()).append(",");
-			}
-			buffer.deleteCharAt(buffer.length() - 1);
-			DistributionReservationEntity distributionReservationEntity = new DistributionReservationEntity();
-			BeanUtils.copyProperties(distributionReservationDTO, distributionReservationEntity);
-			distributionReservationEntity.setCollectFee(collectFee);
-			distributionReservationEntity.setReplaceFee(replaceFee);
-			//设置订单自编号,这里的数据属于冗余部分
-			distributionReservationEntity.setStockArticleId(buffer.toString());
-			//设置状态未备货
-			distributionReservationEntity.setStockupStatus("1");
-			//设置预约状态为待确认
-			distributionReservationEntity.setReservationStatus("1");
-			//设置预约信息来源是自建的方式
-			distributionReservationEntity.setOrderSource("3");
-
-			//这里就对新增的预约信息进行保存
-			this.save(distributionReservationEntity);
-			Long reservationEntityId = distributionReservationEntity.getId();
-			//保存完之后获取新插入的预约服务获取ID然后订单派送单进行绑定
-			deliveryEntities.forEach(i -> {
-				i.setReservationId(reservationEntityId);
-				distributionStockArticleService.getBaseMapper().updateById(i);
-			});
-		} catch (Exception e) {
-			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-			log.error("出现异常:+{" + e.getMessage() + "}");
-			return false;
-		}
+//		try {
+//			if (Func.isEmpty(distributionReservationDTO)) {
+//				log.error("参数错误+{" + distributionReservationDTO + "}");
+//				return false;
+//			}
+//			//这里新增需要对预约列表下的订单配送单的金额进行计算
+//			String idsStr = distributionReservationDTO.getIds();
+//			List<Long> ids = Func.toLongList(idsStr);
+//			if (Func.isEmpty(ids)) {
+//				log.error("ids参数错误:+{" + ids + "}");
+//				return false;
+//			}
+//			BigDecimal collectFee = new BigDecimal("0");
+//			BigDecimal replaceFee = new BigDecimal("0");
+//			StringBuffer buffer = new StringBuffer();
+//			List<DistributionStockArticleEntity> deliveryEntities = new ArrayList<>();
+//			for (int i = 0; i < ids.size(); i++) {
+//				BaseMapper<DistributionStockArticleEntity> stockArticleMapper = distributionStockArticleService.getBaseMapper();
+//				DistributionStockArticleEntity distributionStockArticleEntity = stockArticleMapper.selectById(ids.get(i));
+////				deliveryEntities.add(distributionDeliveryEntity);
+////				collectFee = collectFee.add(distributionDeliveryEntity.getCollectFee());
+////				//待收货款累加
+////				replaceFee = replaceFee.add(distributionDeliveryEntity.getReplaceFee());
+////				String orderId = distributionDeliveryEntity.getOrderId();
+//				buffer.append(distributionStockArticleEntity.getId()).append(",");
+//			}
+//			buffer.deleteCharAt(buffer.length() - 1);
+//			DistributionReservationEntity distributionReservationEntity = new DistributionReservationEntity();
+//			BeanUtils.copyProperties(distributionReservationDTO, distributionReservationEntity);
+//			distributionReservationEntity.setCollectFee(collectFee);
+//			distributionReservationEntity.setReplaceFee(replaceFee);
+//			//设置订单自编号,这里的数据属于冗余部分
+//			distributionReservationEntity.setStockArticleId(buffer.toString());
+//			//设置状态未备货
+//			distributionReservationEntity.setStockupStatus("1");
+//			//设置预约状态为待确认
+//			distributionReservationEntity.setReservationStatus("1");
+//			//设置预约信息来源是自建的方式
+//			distributionReservationEntity.setOrderSource("3");
+//
+//			//这里就对新增的预约信息进行保存
+//			this.save(distributionReservationEntity);
+//			Long reservationEntityId = distributionReservationEntity.getId();
+//			//保存完之后获取新插入的预约服务获取ID然后订单派送单进行绑定
+//			deliveryEntities.forEach(i -> {
+//				i.setReservationId(reservationEntityId);
+//				distributionStockArticleService.getBaseMapper().updateById(i);
+//			});
+//		} catch (Exception e) {
+//			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//			log.error("出现异常:+{" + e.getMessage() + "}");
+//			return false;
+//		}
 		return true;
 	}