diff --git a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
index 7d5c44bb6..2749bc113 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
@@ -41,10 +41,10 @@ public class LauncherServiceImpl implements LauncherService {
 		PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile));
 
 
-		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.username","nacos");
-		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.password","Nacos123123");
-		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.username","nacos");
-		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.password","Nacos123123");
+//		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.username","nacos");
+//		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.password","Nacos123123");
+//		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.username","nacos");
+//		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.password","Nacos123123");
 
 		PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
 
diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStorageServicesClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStorageServicesClient.java
index 8eb7cb4e7..143514715 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStorageServicesClient.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStorageServicesClient.java
@@ -51,4 +51,7 @@ public interface IBasicdataStorageServicesClient {
 
     @GetMapping(API_PREFIX+"/findBySendWarehouseIdAndClientId")
 	List<BasicdataStorageServicesEntity> findBySendWarehouseIdAndClientId(@RequestParam Long warehouseId, @RequestParam Long clientId);
+
+	@GetMapping(API_PREFIX+"/findEntityBySendWarehouseIdAndClientId")
+	BasicdataStorageServicesEntity findEntityBySendWarehouseIdAndClientId(@RequestParam Long warehouseId, @RequestParam Long clientId);
 }
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java
index f35c72f5e..c8a08bab3 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java
@@ -375,6 +375,9 @@ public class DistributionParcelListEntity extends TenantEntity {
 	@ApiModelProperty(value = "是否中转")
 	private Integer isTransfer;//是否中转
 
+	@ApiModelProperty(value = "暂存单id")
+	private Long advanceId;//暂存单id
+
 //	/**
 //	 * 配送状态
 //	 */
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java
index 648b0ddde..4955b0dc6 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java
@@ -134,4 +134,7 @@ public interface IDistributionParcelListClient {
 	R<DistributionParcelListEntity> queryOrderByOrderPackageCode( @RequestParam String orderPackageCode);
 	@GetMapping(API_PREFIX+"/updateTransferStatus")
     void updateTransferStatus(@RequestParam String orderCode, @RequestParam Long warehouseId, @RequestParam Integer isTransfer);
+
+	@GetMapping(API_PREFIX+"/updateEntityByOpenOrder")
+	void updateEntityByOpenOrder(@RequestParam Long advanceId, @RequestParam Long warehouseId, @RequestParam Long waybillId);
 }
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
index 46584e39c..836c3ffd8 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
@@ -17,6 +17,7 @@
 package com.logpm.distribution.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -167,4 +168,37 @@ public class DistributionParcelListVO extends DistributionParcelListEntity {
 	private String noteNumber;
 
 
+	/**
+	 *  时间模糊查询需要的值
+	 */
+	@ApiModelProperty(value = "入库开始时间")
+	@TableField(exist = false)
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+	private String startWarehouseEntryTimeEnd;
+
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "入库结束时间")
+	@TableField(exist = false)
+	private String lastWarehouseEntryTimeEnd;
+
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "装车开始时间")
+	@TableField(exist = false)
+	private String startLoadingTime;
+
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "装车结束时间")
+	@TableField(exist = false)
+	private String lastLoadingTime;
+
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "签收开始时间")
+	@TableField(exist = false)
+	private String startSigningTime;
+
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "签收结束时间")
+	@TableField(exist = false)
+	private String lastSigningTime;
+
 }
diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java
index b9c369dd9..656e2b06b 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java
@@ -37,4 +37,8 @@ public class BillladingDTO extends TrunklineBillladingEntity {
 
 	private String clientName;
 
+
+	private String startDateStr;
+	private String endDateStr;
+
 }
diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java
index b8f06fa47..1f0e63bee 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java
@@ -36,6 +36,7 @@ public class LoadCarsDTO implements Serializable {
 
 
 	private Long carsOrderId;
+	private String carsOrderIds;
 	private Integer planNum;
 
 	private String isCustomer;
diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingDetailListVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingDetailListVO.java
new file mode 100644
index 000000000..3981d6b96
--- /dev/null
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingDetailListVO.java
@@ -0,0 +1,13 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class TrunklineBillladingDetailListVO implements Serializable {
+
+	private String orderPackageCode;
+	private String packageStatus;
+
+}
diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingDetailVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingDetailVO.java
new file mode 100644
index 000000000..0d3143bc6
--- /dev/null
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingDetailVO.java
@@ -0,0 +1,15 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class TrunklineBillladingDetailVO implements Serializable {
+
+	private String serviceNum;
+	private String orderCode;
+	private Integer totalNum;
+	private Integer scanNum;
+
+}
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStorageServicesClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStorageServicesClient.java
index d7a29cc66..778bea708 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStorageServicesClient.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStorageServicesClient.java
@@ -29,6 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 门店服务仓库表 Feign实现类
@@ -63,4 +64,17 @@ public class BasicdataStorageServicesClient implements IBasicdataStorageServices
 		return basicdataStorageServicesService.list(queryWrapper);
 	}
 
+	@Override
+	public BasicdataStorageServicesEntity findEntityBySendWarehouseIdAndClientId(Long warehouseId, Long clientId) {
+		QueryWrapper<BasicdataStorageServicesEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("send_warehouse_id",warehouseId)
+			.eq("client_id",clientId)
+			.eq("is_deleted",0);
+		BasicdataStorageServicesEntity servicesEntity = basicdataStorageServicesService.getOne(queryWrapper);
+		if(Objects.isNull(servicesEntity)){
+			servicesEntity = basicdataStorageServicesService.findEntityBySendWarehouseIdIsNullAndClientId(clientId);
+		}
+		return servicesEntity;
+	}
+
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml
index 9b1ab9b4b..80169f3f4 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml
@@ -291,8 +291,8 @@
         lwtg.tray_code trayCode,
         lwug.position_code positionCode,
         SUM(lwug.num) num,
-        GROUP_CONCAT(lwug.create_time SEPARATOR '、') upTime,
-        GROUP_CONCAT(lwug.create_user SEPARATOR '、') upUser,
+        GROUP_CONCAT(DISTINCT lwug.create_time SEPARATOR '、') upTime,
+        GROUP_CONCAT(DISTINCT lwug.create_user SEPARATOR '、') upUser,
         (SELECT 		GROUP_CONCAT( DISTINCT ldsli.order_code) order_code FROM logpm_distribution_stock_list_info ldsli WHERE
         ldsli.incoming_batch = ldsl.incoming_batch
         AND ldsli.material_id = ldsl.material_id
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.java
index c1f9ce265..a257f2f2d 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.java
@@ -51,4 +51,6 @@ public interface BasicdataStorageServicesMapper extends BaseMapper<BasicdataStor
 	 * @return
 	 */
 	List<BasicdataStorageServicesExcel> exportBasicdataStorageServices(@Param("ew") Wrapper<BasicdataStorageServicesEntity> queryWrapper);
+
+    BasicdataStorageServicesEntity findEntityBySendWarehouseIdIsNullAndClientId(@Param("clientId") Long clientId);
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml
index dbc087151..684861a99 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml
@@ -51,4 +51,11 @@
         SELECT * FROM logpm_basicdata_storage_services ${ew.customSqlSegment}
     </select>
 
+    <select id="findEntityBySendWarehouseIdIsNullAndClientId" resultType="com.logpm.basicdata.entity.BasicdataStorageServicesEntity">
+        select *
+        from logpm_basicdata_storage_services
+        where send_warehouse_id is null
+        and client_id = #{clientId}
+    </select>
+
 </mapper>
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java
index 4416f9441..21c1af991 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java
@@ -55,4 +55,6 @@ public interface IBasicdataStorageServicesService extends BaseService<BasicdataS
 	boolean submitSave(BasicdataStorageServicesDTO basicdataStorageServices);
 
 	List<BasicdataStorageServicesVO> pageList(IPage<Object> page, Map<String, Object> basicdataStorageServices);
+
+    BasicdataStorageServicesEntity findEntityBySendWarehouseIdIsNullAndClientId(Long clientId);
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java
index cdb1dac88..4b881368c 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java
@@ -146,7 +146,7 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService {
 			bladeRedis.expireAt(key,CommonUtil.getDayEnd());
 		}
 
-		return warehouseCode+f+dateShort+CommonUtil.geFourNumber(incr,5);
+		return warehouseCode+f+CommonUtil.geFourNumber(incr,5);
 
 	}
 
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java
index d3188e31e..c23ddafcb 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java
@@ -153,4 +153,9 @@ public class BasicdataStorageServicesServiceImpl extends BaseServiceImpl<Basicda
 		return baseMapper.selectBasicdataStorageServicesPage(page,basicdataStorageServicesvo);
 	}
 
+	@Override
+	public BasicdataStorageServicesEntity findEntityBySendWarehouseIdIsNullAndClientId(Long clientId) {
+		return baseMapper.findEntityBySendWarehouseIdIsNullAndClientId(clientId);
+	}
+
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionCancelReservationPackageDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionCancelReservationPackageDTO.java
index a4232118b..9041b407a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionCancelReservationPackageDTO.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionCancelReservationPackageDTO.java
@@ -64,7 +64,7 @@ public class DistributionCancelReservationPackageDTO {
 	/**
 	 * 库存品包件ID
 	 */
-	private Long inventoryPackageId;
+	private String inventoryPackageIds;
 
 
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
index 0dd61a7aa..269030288 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
@@ -41,6 +41,7 @@ import springfox.documentation.annotations.ApiIgnore;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * 在库订单包件清单 Feign实现类
@@ -277,4 +278,15 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 		distributionParcelListService.updateTransferStatus(orderCode,warehouseId,isTransfer);
 
 	}
+
+	@Override
+	public void updateEntityByOpenOrder(Long advanceId, Long warehouseId, Long waybillId) {
+
+		Set<String> set = distributionParcelListService.updateEntityByOpenOrder(advanceId, warehouseId, waybillId);
+
+		for (String orderCode : set) {
+			distributionStockArticleService.updateOrderInfo(orderCode,warehouseId);
+		}
+
+	}
 }
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 940a009da..8da37d894 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
@@ -121,7 +121,7 @@
         logpm_distribution_signfor lds
         JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
         <where>
-            lds.is_deleted = 0 and lds.delivery_id = #{id} and ldr.reservation_status != 40
+            lds.is_deleted = 0 and lds.delivery_id = #{id} and ldr.reservation_status != 40 AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0
         </where>
     </select>
     <select id="selectDistributionDeliverywrapInfoPage"
@@ -678,7 +678,7 @@ FROM
         logpm_distribution_signfor lds
         JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
         <where>
-            lds.is_deleted = 0 and lds.delivery_id = #{id} and ldr.reservation_status != 40
+            lds.is_deleted = 0 and lds.delivery_id = #{id} and ldr.reservation_status != 40 AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0
             <if test="param.reservationCode != '' and param.reservationCode != null">
                 and ldr.reservation_code like concat('%',#{param.reservationCode},'%')
             </if>
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 cf46a25ab..8eb691651 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
@@ -210,7 +210,7 @@
         left JOIN logpm_distribution_signfor lds on lddl.id = lds.delivery_id
         LEFT JOIN logpm_distribution_reservation ldr on ldr.id = lds.reservation_id
         <where>
-            lddl.is_deleted = 0
+            lddl.is_deleted = 0 AND (IF(lddl.delivery_number is null ,0,lddl.delivery_number) + IF(lddl.inventory_nub is null ,0,lddl.inventory_nub)) > 0
             <if test="param.trainNumber != null and param.trainNumber!=''">
                 and lddl.train_number like concat('%',#{param.trainNumber},'%')
             </if>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
index e443fba7a..8449daa30 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
@@ -163,11 +163,11 @@
             <if test="param.reservationCode !='' and param.reservationCode != null">
                 and ldr.reservation_code = #{param.reservationCode}
             </if>
-            <if test="param.DvehicleName !='' and param.DvehicleName != null">
-                and lddl.vehicle_name = #{param.DvehicleName}
+            <if test="param.dvehicleName !='' and param.dvehicleName != null">
+                and lddl.vehicle_name = #{param.dvehicleName}
             </if>
-            <if test="param.ZvehicleName !='' and param.ZvehicleName != null">
-                and ldl.vehicle_name = #{param.ZvehicleName}
+            <if test="param.vehicleName !='' and param.vehicleName != null">
+                and ldl.vehicle_name = #{param.vehicleName}
             </if>
             <if test="param.scanTime !='' and param.scanTime != null">
                 and date_format(from_unixtime(ldl.scan_time),'%Y-%m-%d') = date_format(#{param.scanTime}),'%Y-%m-%d')
@@ -253,6 +253,21 @@
             <if test="param.waybillNumber != '' and param.waybillNumber != null ">
                 and ldpl.waybill_number = #{param.waybillNumber}
             </if>
+            <if test="param.scanUser !='' and param.scanUser != null">
+                and ldl.scan_user = #{param.scanUser}
+            </if>
+            <if test="param.signingUser !='' and param.signingUser != null">
+                and ldl.signing_user  = #{param.signingUser}
+            </if>
+            <if test="param.startWarehouseEntryTimeEnd != null and param.startWarehouseEntryTimeEnd !='' and param.lastWarehouseEntryTimeEnd !=''and param.lastWarehouseEntryTimeEnd != null">
+               and ldpl.warehouse_entry_time_end  BETWEEN #{param.startWarehouseEntryTimeEnd} AND #{param.lastWarehouseEntryTimeEnd}
+            </if>
+            <if test="param.startLoadingTime != null and param.lastLoadingTime != null and param.startLoadingTime != '' and param.lastLoadingTime != ''">
+                AND ldl.scan_time  BETWEEN #{param.startLoadingTime} AND #{param.lastLoadingTime}
+            </if>
+            <if test="param.startSigningTime != null and param.lastSigningTime != null and param.startSigningTime != '' and param.lastSigningTime != ''">
+                AND ldl.signing_time  BETWEEN #{param.startSigningTime} AND #{param.lastSigningTime}
+            </if>
 
         </where>
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
index 28f749d30..0d0474983 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
@@ -29,6 +29,7 @@ import org.springblade.core.tool.api.R;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * 在库订单包件清单 服务类
@@ -171,4 +172,7 @@ public interface IDistributionParcelListService extends BaseService<Distribution
     DistributionParcelListEntity selectByOrderPackageCode(String orderPackageCode, Long warehouseId);
 
 	void updateTransferStatus(String orderCode, Long warehouseId,Integer isTransfer);
+
+	Set<String> updateEntityByOpenOrder(Long advanceId, Long warehouseId, Long waybillId);
+
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
index 01eea1e19..d8c200cee 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
@@ -25,7 +25,9 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basic.entity.BasicMaterialEntity;
 import com.logpm.basic.feign.IBasicMaterialClient;
+import com.logpm.basicdata.entity.BasicdataClientEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataClientClient;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.dto.DistributionParcelListDTO;
 import com.logpm.distribution.dto.app.StockupDTO;
@@ -39,12 +41,15 @@ import com.logpm.distribution.vo.DistributionParcelListVO;
 import com.logpm.distribution.vo.DistributionParcelListZeroVO;
 import com.logpm.distribution.vo.PackageStockupVO;
 import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity;
+import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
 import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient;
+import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.order.OrderStockupStatusConstant;
+import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -95,6 +100,9 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 
 	private final RabbitTemplate rabbitTemplate;
 
+	private final IWarehouseWaybillClient warehouseWaybillClient;
+	private final IBasicdataClientClient basicdataClientClient;
+//	private final IDistributionStockArticleService distributionStockArticleService;
 
 	@Override
 	public IPage<DistributionParcelListEntity> selectDistributionParcelListPage(IPage<DistributionParcelListEntity> page, DistributionParcelListVO distributionParcelList) {
@@ -640,6 +648,66 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		baseMapper.updateTransferStatus(orderCode,warehouseId,isTransfer);
 	}
 
+	@Override
+	public Set<String> updateEntityByOpenOrder(Long advanceId, Long warehouseId, Long waybillId) {
+		WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId);
+		if(Objects.isNull(waybillEntity)){
+			log.warn("############updateEntityByOpenOrder: 运单信息不存在 waybillId={}",waybillId);
+			throw new CustomerException(405,"运单信息不存在");
+		}
+		Long departureWarehouseId = waybillEntity.getDepartureWarehouseId();
+		String departureWarehouseName = waybillEntity.getDepartureWarehouseName();
+		Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId();
+		String destinationWarehouseName = waybillEntity.getDestinationWarehouseName();
+		String waybillNo = waybillEntity.getWaybillNo();
+
+		QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("advance_id",advanceId)
+			.eq("warehouse_id",warehouseId)
+			.eq("is_deleted",0);
+		List<DistributionParcelListEntity> listEntityList = baseMapper.selectList(queryWrapper);
+		Set<String> orderCodes = new TreeSet<>();
+		for (DistributionParcelListEntity parcelListEntity : listEntityList) {
+			parcelListEntity.setWaybillId(waybillId+"");
+			parcelListEntity.setWaybillNumber(waybillNo);
+			parcelListEntity.setSendWarehouseId(departureWarehouseId);
+			parcelListEntity.setSendWarehouseName(departureWarehouseName);
+			parcelListEntity.setAcceptWarehouseId(destinationWarehouseId);
+			parcelListEntity.setAcceptWarehouseName(destinationWarehouseName);
+			if(departureWarehouseId.equals(destinationWarehouseId)){
+				parcelListEntity.setIsTransfer(0);
+			}else{
+				parcelListEntity.setIsTransfer(1);
+			}
+			orderCodes.add(parcelListEntity.getOrderCode());
+		}
+		updateBatchById(listEntityList);
+
+
+		for (String orderCode : orderCodes) {
+			QueryWrapper<DistributionStockArticleEntity> stockArticleEntityQueryWrapper = new QueryWrapper<>();
+			stockArticleEntityQueryWrapper.eq("order_code",orderCode)
+				.eq("warehouse_id",warehouseId)
+				.eq("is_deleted",0);
+			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleMapper.selectOne(stockArticleEntityQueryWrapper);
+			if(Objects.isNull(stockArticleEntity)){
+				log.error("############updateEntityByOpenOrder: 未找到订单信息 orderCode={}",orderCode);
+				continue;
+			}
+			Long consigneeId = waybillEntity.getConsigneeId();
+			BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId);
+			stockArticleEntity.setMallId(consigneeId);
+			stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
+			stockArticleEntity.setMallName(basicdataClientEntity.getClientName());
+			stockArticleEntity.setConsigneePerson(waybillEntity.getConsigneeName());
+			stockArticleEntity.setConsigneeMobile(waybillEntity.getConsigneeMobile());
+			stockArticleEntity.setConsigneeAddress(waybillEntity.getConsigneeAddress());
+			stockArticleEntity.setConsigneeUnit(basicdataClientEntity.getClientName());
+			distributionStockArticleMapper.updateById(stockArticleEntity);
+		}
+		return orderCodes;
+	}
+
 	/**
 	 * @param distributionParcelList 包件信息
 	 * @return
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 2e98fa1e1..e76bae8eb 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
@@ -3541,10 +3541,11 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			Integer signingNum =  distributionLoadscanMapper.selectSigningNumByReservationId(reservationId);
 			//判断当前客户是否签收完成了
 			if (signingNum > 0){
-				reservationEntity.setSigningStatus(ReservationSigningStatusConstant.yiqianshou.getValue());
-			}else {
 				reservationEntity.setSigningStatus(ReservationSigningStatusConstant.bufenqianshou.getValue());
 			}
+			if (signingNum == 0){
+				reservationEntity.setSigningStatus(ReservationSigningStatusConstant.daiqianshou.getValue());
+			}
 		}
 		this.updateById(reservationEntity);
 
@@ -3603,6 +3604,44 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						}
 					}
 				}
+				break;
+			case 2:
+				//取消库存品包件
+				if (Func.isEmpty(distributionCancelReservationPackageDTO.getInventoryPackageIds())){
+					log.error(method+"InventoryPackageIds参数缺失");
+					return R.fail("请联系管理员....");
+				}
+				String[] invenPackageIds = distributionCancelReservationPackageDTO.getInventoryPackageIds().split(",");
+				List<DisStockListDetailEntity> disStockListDetailEntities = distributionReservationMapper.selectInventoryListByReservation(distributionCancelReservationPackageDTO.getReservationId());
+				if (Func.isNotEmpty(disStockListDetailEntities)){
+					for (String invenPackageId : invenPackageIds) {
+						List<DisStockListDetailEntity> inventory = disStockListDetailEntities.stream().filter(inven -> inven.getId().equals(Long.parseLong(invenPackageId))).collect(Collectors.toList());
+						if (Func.isNotEmpty(inventory) &&inventory.size() == 1){
+							DisStockListDetailEntity disStockListDetailEntity = inventory.get(0);
+							if (disStockListDetailEntity.getStockSignfoStatus().equals(InventorySigningStatusConstant.yiqianshou.getValue())
+								||disStockListDetailEntity.getStockLockingStatus().equals(InventoryLoadingStatusConstant.yizhuangche.getValue())){
+								log.info(method+"检测当前取消包件存在装车或者签收操作:inventoryPackageId{}",disStockListDetailEntity.getId());
+								throw  new RuntimeException("包件存在装车、签收,无法进行取消");
+							}
+							//库存品配送包件的取消操作
+							disStockListDetailEntity.setStockPackageStatus(InventoryPackageStatusConstant.quxiao.getValue());
+							disStockListDetailService.updateById(disStockListDetailEntity);
+							//维护对应预约的配送库存品品类数据
+							distributionReservationStocklistService.maintenanceReservationStockList(distributionCancelReservationPackageDTO.getReservationId());
+							//进行冻结数量的扣减
+							distributionStockListMapper.decreaseStockListQuantityOccupied(disStockListDetailEntity.getStockListId(),disStockListDetailEntity.getNum());
+						}else {
+							log.error(method+"库存品包件信息异常");;
+							throw  new RuntimeException("库存品包件信息异常");
+						}
+
+					}
+				}else {
+					log.error(method+"预约单没有库存品包件");
+					return R.fail("此预约任务无库存品包件....");
+				}
+				break;
+			default:
 				//维护预约单状态
 				this.maintenanceReservationInfo(distributionCancelReservationPackageDTO.getReservationId());
 				//维护预约单数量
@@ -3626,9 +3665,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	public void maintenanceReservationNum(Long reservationId) {
 		DistributionReservationEntity reservationEntity = this.getById(reservationId);
 		if (Func.isNotEmpty(reservationEntity)){
-			List<DistributionReservationStockarticleEntity> distributionReservationStockarticleEntities = distributionReservationMapper.selectStockArticleByReservationId(reservationId);
-			if (Func.isNotEmpty(distributionReservationStockarticleEntities)){
-				int sum = distributionReservationStockarticleEntities.stream().mapToInt(DistributionReservationStockarticleEntity::getReservationNum).sum();
+			List<DistributionParcelListEntity> distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationId(reservationId);
+			if (Func.isNotEmpty(distributionParcelListEntities)){
+				int sum = distributionParcelListEntities.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
 				reservationEntity.setReservationNum(sum);
 			}
 			List<DistributionReservationStocklistEntity> reservationStocklistEntities = distributionReservationMapper.selectStockListByReservationId(reservationId);
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 8d0e0f137..53777a969 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -511,7 +511,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		}
 		if (Func.isEmpty(distrilbutionloadingscanDTO.getBarcodes())){
 			log.error(method+"barCode参数缺失");
-			return R.fail("请联系管理员!!!");
+			return R.fail("此库存品暂未进行备货，请联系管理员!!!");
 		}
 		String[] split = distrilbutionloadingscanDTO.getBarcodes().split(",");
 		List<DisStockListDetailEntity> detailEntities = distributionReservationMapper.selectInventoryListByReservation(distrilbutionloadingscanDTO.getReservationId());
@@ -528,6 +528,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						.ne(DistributionLoadscaninvnEntity::getScanStatus, 1));
 					    BladeUser user = AuthUtil.getUser();
 					if (Func.isNotEmpty(loadscaninvnEntity)){
+						if (loadscaninvnEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())){
+							log.error(method+"库存品："+s+"已经签收，无需重复签收");
+							throw new RuntimeException("库存品："+s+"已经签收，无需重复签收");
+						}
 						//存在装车数据，进行状态变更即可
 						loadscaninvnEntity.setSigningUserId(user.getUserId());
 						loadscaninvnEntity.setSigningUser(user.getNickName());
@@ -576,6 +580,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscaninvnEntity.setLoadingId(distributionDeliverySelfEntity.getId().toString());
 						distributionLoadscaninvnEntity.setOrderPackageCode(inventoryPackage.get(0).getStockPackageCode());
 						distributionLoadscaninvnEntity.setInventoryId(inventoryPackage.get(0).getStockListId());
+						distributionLoadscaninvnEntity.setInventoryPackageId(inventoryPackage.get(0).getId());
 						distributionLoadscaninvnEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
 						distributionLoadscaninvnEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
 						distributionLoadscaninvnEntity.setScanUser(user.getNickName());
@@ -605,6 +610,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					//修改对应库存品包件的签收数量
 					DisStockListDetailEntity disStockListDetailEntity = inventoryPackage.get(0);
 					disStockListDetailEntity.setStockSignfoStatus(InventorySigningStatusConstant.yiqianshou.getValue());
+					disStockListDetailEntity.setStockLockingStatus(InventoryLoadingStatusConstant.yizhuangche.getValue());
 					disStockListDetailService.updateById(disStockListDetailEntity);
 				}else {
 					//出现不属于当前客户的库存品包件信息
@@ -2089,6 +2095,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					distributionLoadscaninvnEntity.setLoadingId(distributionDeliverySelfEntity.getId().toString());
 					distributionLoadscaninvnEntity.setOrderPackageCode(inventory.get(0).getStockPackageCode());
 					distributionLoadscaninvnEntity.setInventoryId(inventory.get(0).getStockListId());
+					distributionLoadscaninvnEntity.setInventoryPackageId(inventory.get(0).getId());
 					distributionLoadscaninvnEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
 					distributionLoadscaninvnEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
 					distributionLoadscaninvnEntity.setScanUser(user.getUserName());
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index a73d3c38e..ce50109ae 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -54,7 +54,6 @@ import org.springblade.common.constant.order.OrderStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageLoadingStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
-import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
 import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
@@ -1317,7 +1316,10 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 			String orderPackageStatus = parcelListEntity.getOrderPackageStatus();
 			String orderPackageReservationStatus = parcelListEntity.getOrderPackageReservationStatus();
 			String orderPackageGroundingStatus = parcelListEntity.getOrderPackageGroundingStatus();
-			waybillNoSet.add(parcelListEntity.getWaybillNumber());
+			String waybillNumber = parcelListEntity.getWaybillNumber();
+			if(StringUtils.isNotBlank(waybillNumber)){
+				waybillNoSet.add(parcelListEntity.getWaybillNumber());
+			}
 
 			if("20".equals(orderPackageGroundingStatus)){
 				groundingNum = groundingNum + 1;
diff --git a/blade-service/logpm-distribution/src/main/resources/application-dev.yml b/blade-service/logpm-distribution/src/main/resources/application-dev.yml
index 87a009b0c..b067e4795 100644
--- a/blade-service/logpm-distribution/src/main/resources/application-dev.yml
+++ b/blade-service/logpm-distribution/src/main/resources/application-dev.yml
@@ -15,7 +15,7 @@ server:
 spring:
   #rabbitmq配置
   rabbitmq:
-    host: 192.168.10.100
+    host: 192.168.10.46
     port: 5672
     username: admin
     password: admin
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/BillladingApiController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/BillladingApiController.java
index 09081e811..de2d892a6 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/BillladingApiController.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/BillladingApiController.java
@@ -6,6 +6,8 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.trunkline.dto.BillladingDTO;
 import com.logpm.trunkline.service.ITrunklineBillladingService;
+import com.logpm.trunkline.vo.TrunklineBillladingDetailListVO;
+import com.logpm.trunkline.vo.TrunklineBillladingDetailVO;
 import com.logpm.trunkline.vo.TrunklineBillladingVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,6 +15,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
@@ -58,4 +61,70 @@ public class BillladingApiController {
 	}
 
 
+	@ResponseBody
+	@PostMapping("/billladingList")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "提货列表", notes = "传入billladingDTO")
+	public R billladingList(@RequestBody BillladingDTO billladingDTO) {
+		String method = "############billladingList: ";
+		log.info(method+"请求参数{}",billladingDTO);
+		try{
+
+			//当前登录人选择的仓库
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(403,"仓库信息为空");
+			}
+			billladingDTO.setWarehouseId(myCurrentWarehouse.getId());
+
+			IPage<TrunklineBillladingDetailVO> pages = billladingService.billladingList(billladingDTO);
+
+			return R.data(pages);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error("############sendOrders: 系统异常",e);
+			return R.fail(500,"############sendOrders: 系统异常");
+		}
+	}
+
+
+	@ResponseBody
+	@PostMapping("/findAdvanceDetailList")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查询暂存单明细列表", notes = "传入billladingDTO")
+	public R findAdvanceDetailList(@RequestBody BillladingDTO billladingDTO) {
+		String method = "############findAdvanceDetailList: ";
+		log.info(method+"请求参数{}",billladingDTO);
+		String orderCode = billladingDTO.getOrderCode();
+		try{
+
+			//当前登录人选择的仓库
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(403,"仓库信息为空");
+			}
+			billladingDTO.setWarehouseId(myCurrentWarehouse.getId());
+
+			if(StringUtil.isBlank(orderCode)){
+				log.warn(method+"订单号为空 orderCode={}",orderCode);
+				return R.fail(403,"订单号为空");
+			}
+
+			IPage<TrunklineBillladingDetailListVO> pages = billladingService.findAdvanceDetailList(billladingDTO);
+
+			return R.data(pages);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error("############sendOrders: 系统异常",e);
+			return R.fail(500,"############sendOrders: 系统异常");
+		}
+	}
+
+
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java
index 0be4cb655..8b87e659e 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java
@@ -417,7 +417,7 @@ public class CarsLoadController {
 	public R removeCarsOrderByCarsOrderId(@RequestBody LoadCarsDTO loadCarsDTO) {
 		String method = "############removeCarsOrderByCarsOrderId: ";
 		log.info(method+"请求参数{}",loadCarsDTO);
-		Long carsOrderId = loadCarsDTO.getCarsOrderId();
+		String carsOrderIds = loadCarsDTO.getCarsOrderIds();
 		try{
 
 			//当前登录人选择的仓库
@@ -427,8 +427,8 @@ public class CarsLoadController {
 				return R.fail(400,"仓库信息为空");
 			}
 			loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
-			if(Objects.isNull(carsOrderId)){
-				log.warn(method+"节点订单id为空 carsOrderId={}",carsOrderId);
+			if(StringUtil.isBlank(carsOrderIds)){
+				log.warn(method+"节点订单id为空 carsOrderIds={}",carsOrderIds);
 				return R.fail(400,"节点订单id为空");
 			}
 
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java
index 7885d6d7d..599377cc9 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java
@@ -27,4 +27,6 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper<TrunklineAdvanc
 	List<BillladingPackageVO> findBillladingPackageByAdvanceIdsAnd(@Param("list") List<Long> advanceIds);
 
     IPage<TrunklineAdvanceDetailVO> advanceDetailPageList(IPage<Object> page, @Param("param") AdvanceDetailDTO advanceDetailDTO);
+
+    Integer getIncomingNum(@Param("advanceId") Long advanceId);
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
index 9093cbbbc..f7f50f5af 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
@@ -117,4 +117,12 @@
         order by ltad.create_time desc
     </select>
 
+    <select id="getIncomingNum" resultType="int">
+        select count(ltad.id)
+        from logpm_trunkline_advance_detail ltad
+        where ltad.advance_id = #{advanceId}
+        and ltad.is_deleted = 0
+        and ltad.package_status = 1
+    </select>
+
 </mapper>
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java
index 49d83dce5..4299100db 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java
@@ -4,11 +4,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.trunkline.dto.BillladingDTO;
 import com.logpm.trunkline.entity.TrunklineBillladingEntity;
+import com.logpm.trunkline.vo.TrunklineBillladingDetailListVO;
+import com.logpm.trunkline.vo.TrunklineBillladingDetailVO;
 import com.logpm.trunkline.vo.TrunklineBillladingVO;
 import com.logpm.warehouse.vo.WarehouseWaybillVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 @Mapper
@@ -19,4 +22,8 @@ public interface TrunklineBillladingMapper extends BaseMapper<TrunklineBillladin
 	IPage<TrunklineBillladingVO> pageInfoList(IPage<Object> page, @Param("param") BillladingDTO billladingDTO);
 
 	IPage<WarehouseWaybillVO> findWaybillListNotBillladingId(IPage<Object> page,@Param("list") List<String> waybillNos);
+
+    IPage<TrunklineBillladingDetailVO> billladingList(IPage<Object> page, @Param("warehouseId") Long warehouseId, @Param("startByDateStr") Date startByDateStr, @Param("endByDateStr") Date endByDateStr);
+
+	IPage<TrunklineBillladingDetailListVO> findAdvanceDetailList(IPage<Object> page, @Param("orderCode") String orderCode);
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml
index 1a517af53..50a7852c0 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml
@@ -4,16 +4,34 @@
 
     <select id="pageList" resultType="com.logpm.trunkline.vo.TrunklineBillladingVO">
         select ltb.id id,
-               ltb.billlading_code billladingCode,
-               ltb.car_number carNumber,
-               ltb.driver_name driverName,
-               ltb.driver_phone driverPhone,
-               ltb.line_name_title lineTameTitle,
-               ltb.warehouse_id warehouseId,
-               ltb.warehouse_name warehouseName,
-               ltb.billlading_status billladingStatus,
-               ltb.carrier_name carrierName
+        ltb.billlading_code billladingCode,
+        ltb.car_number carNumber,
+        ltb.driver_id driverId,
+        ltb.driver_name driverName,
+        ltb.driver_phone driverPhone,
+        ltb.line_name_title lineNameTitle,
+        ltb.start_time startTime,
+        ltb.end_time endTime,
+        ltb.plan_num planNum,
+        ltb.plan_volume planVolume,
+        ltb.plan_weight planWeight,
+        ltb.warehouse_id warehouseId,
+        ltb.warehouse_name warehouseName,
+        ltb.billlading_status billladingStatus,
+        ltb.carrier_name carrierName,
+        ltb.carrier_id carrierId,
+        ltb.charge_type chargeType,
+        ltb.total_fee totalFee,
+        ltb.remark remark,
+        ltb.real_num totalNum,
+        ltb.real_volume totalVolume,
+        ltb.real_weight totalWeight,
+        ltb.create_user_name createUserName,
+        count(DISTINCT ltbl.id) nodeNub,
+        count(DISTINCT ltbw.id) waybillCount
         from logpm_trunkline_billlading ltb
+        left join logpm_trunkline_billlading_line ltbl on ltbl.billlading_id = ltb.id
+        left join logpm_trunkline_billlading_waybill ltbw on ltbw.billlading_id = ltb.id and ltbw.waybill_no != '————'
         where ltb.is_deleted = 0
         <if test="param.warehouseId != null ">
             and ltb.warehouse_id = #{param.warehouseId}
@@ -42,6 +60,7 @@
         <if test="param.createUserName != null and param.createUserName != '' ">
             and ltb.create_user_name = #{param.createUserName}
         </if>
+        group by ltb.id
         order by ltb.create_time desc
     </select>
 
@@ -86,4 +105,22 @@
 
     </select>
 
+    <select id="billladingList" resultType="com.logpm.trunkline.vo.TrunklineBillladingDetailVO">
+        select ldsa.service_number serviceNum,
+               ldsa.order_code orderCode,
+               ldsa.total_number totalNum,
+               ldsa.incoming_num scanNum
+        from logpm_distribution_stock_article ldsa
+        where ldsa.warehouse_entry_time &gt;= #{startByDateStr}
+        and ldsa.warehouse_entry_time &lt;= #{endByDateStr}
+        and warehouse_id = #{warehouseId}
+    </select>
+
+    <select id="findAdvanceDetailList" resultType="com.logpm.trunkline.vo.TrunklineBillladingDetailListVO">
+        select order_package_code,
+                package_status
+        from logpm_trunkline_advance_detail
+        where order_code = #{orderCode}
+    </select>
+
 </mapper>
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingPackageMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingPackageMapper.xml
index 20a4b352d..8251fdcf0 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingPackageMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingPackageMapper.xml
@@ -24,12 +24,10 @@
                ltbp.create_time createTime
         from logpm_trunkline_billlading_package ltbp
          left join logpm_trunkline_billlading ltb on ltb.id = ltbp.billlading_id
-         left join logpm_trunkline_billlading_waybill ltbw on ltbw.billlading_id = ltb.id
          left join logpm_distribution_parcel_list ldpl on ldpl.order_package_code = ltbp.order_package_code
          left join logpm_warehouse_tray_goods lwtg on lwtg.association_value = ldpl.order_package_code
          left join logpm_warehouse_tray lwt on lwt.id = lwtg.tray_id
-         left join logpm_trunkline_waybill_order ltwo on ltwo.order_code = ldpl.order_code and ltwo.waybill_id = ltbw.waybill_id
-         left join logpm_warehouse_waybill lww on lww.id = ltwo.waybill_id
+         left join logpm_warehouse_waybill lww on lww.waybill_no = ldpl.waybill_number
         where ltbp.billlading_id = #{param.id}
         and ldpl.warehouse_id = #{param.warehouseId}
         <if test="param.billladingCode != null and param.billladingCode != '' ">
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
index fa98ed02e..27e520ab0 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
@@ -117,37 +117,44 @@
 
 
     <select id="findAllOrderList" resultType="com.logpm.trunkline.vo.CarsLoadAllOrderVO">
-        select ldsa.order_code orderCode,
-                ldpl.waybill_number waybillNo,
-                lww.create_time createTime,
-                lww.destination destination,
-                lww.destination_warehouse_name destinationWarehouseName,
-                lww.shipper shipper,
-                lww.consignee consignee,
-                lww.consignee_name consigneeName,
-                lww.goods_name goodsName,
-                ltwo.total_number totalNum,
-                lww.total_weight totalWeight,
-                lww.total_volume totalVolume,
-                lww.customer_train customerTrain,
-                lww.remark remark,
-                lww.waybill_type type,
-                IFNULL(TRUNCATE(lww.total_freight/lww.total_count,4),0) price,
-                IFNULL(TRUNCATE(lww.total_freight/lww.total_count,4),0)*count(ldpl.id) freight,
-                IF(lww.waybill_type = 1,count( ldpl.id ),SUM(ldpl.quantity)) stockNum
+        select t.order_code orderCode,
+        t.waybill_number waybillNo,
+        lww.create_time createTime,
+        lww.destination destination,
+        lww.destination_warehouse_name destinationWarehouseName,
+        lww.shipper shipper,
+        lww.consignee consignee,
+        lww.consignee_name consigneeName,
+        lww.goods_name goodsName,
+        m.total_number totalNum,
+        lww.total_weight totalWeight,
+        lww.total_volume totalVolume,
+        lww.customer_train customerTrain,
+        lww.remark remark,
+        lww.waybill_type type,
+        t.stock_num stockNum,
+        IFNULL(TRUNCATE(lww.total_freight/lww.total_count,4),0) price,
+        IFNULL(TRUNCATE(lww.total_freight/lww.total_count,4),0)*t.stock_num freight
+        from (select ldpl.order_code,
+        ldpl.waybill_number,
+        ldsa.is_zero,
+        IF(ldsa.is_zero = 1,ldsa.hand_quantity,count(ldpl.id)) stock_num
         from logpm_distribution_stock_article ldsa
         left join logpm_distribution_parcel_list ldpl on ldsa.order_code = ldpl.order_code
-        left join logpm_warehouse_waybill lww on lww.waybill_no = ldpl.waybill_number
-        left join logpm_trunkline_waybill_order ltwo on ltwo.waybill_no = lww.waybill_no and ltwo.order_code = ldsa.order_code
-        where ldsa.is_deleted = 0
-        and ldpl.order_package_status in ('20','30')
+        where ldpl.is_deleted = 0
+        and ldpl.order_package_status = '20'
         and ldpl.is_deleted = 0
-          <if test="param.orderCodes != null">
-              and concat(ldsa.order_code,',',ldpl.waybill_number) not in
-              <foreach collection="param.orderCodes" item="item" open="(" separator="," close=")">
-                  #{item}
-              </foreach>
-          </if>
+        and ldpl.is_transfer = 1
+        and ldpl.waybill_number is not null
+        <if test="param.orderCodes != null">
+            and concat(ldpl.order_code,',',ldpl.waybill_number) not in
+            <foreach collection="param.orderCodes" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="param.waybillNo != null and param.waybillNo != ''" >
+            and ldpl.waybill_number like concat('%',#{param.waybillNo},'%')
+        </if>
         <if test="param.orderCode != null and param.orderCode != ''" >
             and ldsa.order_code like concat('%',#{param.orderCode},'%')
         </if>
@@ -155,24 +162,18 @@
             and ldsa.warehouse_id = #{param.warehouseId}
             and ldpl.warehouse_id = #{param.warehouseId}
         </if>
-        group by ldsa.order_code,
-                ldsa.total_number,
-                ldpl.waybill_number,
-                lww.create_time,
-                lww.destination,
-                lww.destination_warehouse_name,
-                lww.shipper,
-                lww.consignee,
-                lww.consignee_name,
-                lww.goods_name,
-                ltwo.total_number,
-                lww.total_weight,
-                lww.total_volume,
-                lww.total_freight,
-                lww.customer_train,
-                lww.remark,
-                lww.waybill_type
-        HAVING count(ldpl.id) &gt; 0
+        group by ldpl.order_code,
+        ldpl.waybill_number,
+        ldsa.is_zero,
+        ldsa.hand_quantity) t
+        left join logpm_warehouse_waybill lww on lww.waybill_no = t.waybill_number
+        left join (select ltwo.waybill_no,
+        ltwo.order_code,
+        sum(ltwo.total_number) total_number
+        from logpm_trunkline_waybill_order ltwo
+        group by ltwo.waybill_no,
+        ltwo.order_code) m on m.order_code = t.order_code and m.waybill_no = t.waybill_number
+        where t.stock_num > 0
     </select>
 
     <select id="findUseOrderList" resultType="com.logpm.trunkline.vo.CarsLoadAllOrderVO">
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml
index 482cc3d3e..8666d55a5 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml
@@ -52,8 +52,8 @@
         select ltco.waybill_no waybillNo,
                ltco.order_code orderCode,
                ltco.plan_num planNum,
-                sum(ltcls.num) loadingNum,
-               sum(ltcls.unload_num) unloadingNum
+               IFNULL(sum(ltcls.num),0) loadingNum,
+               IFNULL(sum(ltcls.unload_num),0) unloadingNum
         from logpm_trunkline_cars_order ltco
         left join logpm_trunkline_cars_load_scan ltcls on ltcls.waybill_no = ltco.waybill_no and ltco.order_code = ltcls.order_code and ltco.load_id = ltcls.load_id
         where ltco.load_id = #{loadId}
@@ -77,12 +77,13 @@
     </select>
 
     <select id="findLoadScanPackageWithOrder" resultType="com.logpm.trunkline.vo.LoadScanOrderVO">
-        select waybill_no waybillNo,
-               order_code orderCode,
-               total_num totalNum,
-               plan_num planNum,
-               real_num realNum
-        from logpm_trunkline_cars_order
+        select ltco.waybill_no waybillNo,
+               ltco.order_code orderCode,
+               ldsa.total_number totalNum,
+               ltco.plan_num planNum,
+               ltco.real_num realNum
+        from logpm_trunkline_cars_order ltco
+        left join logpm_distribution_stock_article ldsa on ldsa.order_code = ltco.order_code and ldsa.warehouse_id = #{warehouseId}
         where load_id = #{loadId}
           and node_id = #{warehouseId}
         and real_num > 0
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java
index f84b4b58c..41253af6f 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java
@@ -28,4 +28,6 @@ public interface ITrunklineAdvanceDetailService extends BaseService<TrunklineAdv
     IPage<TrunklineAdvanceDetailVO> advanceDetailPageList(AdvanceDetailDTO advanceDetailDTO);
 
     TrunklineAdvanceDetailEntity findEntityByOrderPackageCode(String orderPackageCode);
+
+    Integer getIncomingNum(Long advanceId);
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java
index ac49212d3..30870de00 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.trunkline.dto.BillladingDTO;
 import com.logpm.trunkline.dto.BillladingWaybillDTO;
 import com.logpm.trunkline.entity.TrunklineBillladingEntity;
+import com.logpm.trunkline.vo.TrunklineBillladingDetailListVO;
+import com.logpm.trunkline.vo.TrunklineBillladingDetailVO;
 import com.logpm.trunkline.vo.TrunklineBillladingVO;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
@@ -39,4 +41,8 @@ public interface ITrunklineBillladingService extends BaseService<TrunklineBillla
 	R findBillladingClientByName(String clientName);
 
 	R findCarrierByName(String carrierName);
+
+	IPage<TrunklineBillladingDetailVO> billladingList(BillladingDTO billladingDTO);
+
+	IPage<TrunklineBillladingDetailListVO> findAdvanceDetailList(BillladingDTO billladingDTO);
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
index 826051cde..65f423c75 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
@@ -38,6 +38,7 @@ import org.springblade.system.feign.IRegionFeign;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 @Slf4j
@@ -360,21 +361,25 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		List<TrunklineWaybillOrderEntity> waybillOrderEntities = new ArrayList<>();
 		Set<String> orderCodes = new TreeSet<>();
 		for (TrunklineAdvanceEntity advanceEntity:advanceEntityList){
+			Long advanceId = advanceEntity.getId();
+
 			TrunklineWaybillOrderEntity waybillOrderEntity = new TrunklineWaybillOrderEntity();
 			waybillOrderEntity.setWarehouseId(warehouseId);
 			waybillOrderEntity.setWarehouseName(basicdataWarehouseEntity.getName());
 			waybillOrderEntity.setWaybillId(waybillId);
 			waybillOrderEntity.setWaybillNo(waybillNo);
-			waybillOrderEntity.setAdvanceId(advanceEntity.getId());
+			waybillOrderEntity.setAdvanceId(advanceId);
 			waybillOrderEntity.setOrderCode(advanceEntity.getOrderCode());
 			waybillOrderEntity.setTotalNumber(advanceEntity.getTotalNum());
-			waybillOrderEntity.setHandleNumber(0);
+			Integer incomingNum = advanceDetailService.getIncomingNum(advanceId);
+			waybillOrderEntity.setHandleNumber(incomingNum);
 			waybillOrderEntities.add(waybillOrderEntity);
 
 
 			List<TrunklineAdvanceDetailVO> list = advanceDetailService.findList(advanceEntity.getId());
 			trunklineWaybillPackageService.saveList(list,waybillEntity);
-			orderCodes.add(advanceEntity.getOrderCode());
+			distributionParcelListClient.updateEntityByOpenOrder(advanceId,warehouseId,waybillId);
+//			orderCodes.add(advanceEntity.getOrderCode());
 			advanceEntity.setWaybillStatus("1");
 			advanceEntity.setWaybillNo(waybillEntity.getWaybillNo());
 		}
@@ -382,14 +387,14 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		//修改暂存单的状态为已开单
 		advanceService.updateBatchById(advanceEntityList);
 
-		Integer isTransfer = 1;
-		if(departureWarehouseId.equals(destinationWarehouseId)){
-			isTransfer = 0;
-		}
+//		Integer isTransfer = 1;
+//		if(departureWarehouseId.equals(destinationWarehouseId)){
+//			isTransfer = 0;
+//		}
 
-		for (String orderCode : orderCodes) {
-			distributionParcelListClient.updateTransferStatus(orderCode,warehouseId,isTransfer);
-		}
+//		for (String orderCode : orderCodes) {
+//			distributionParcelListClient.updateTransferStatus(orderCode,warehouseId,isTransfer);
+//		}
 
 
 		//计算扫码入库的包件是否需要把运单和提货单挂上
@@ -429,6 +434,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				billladingWaybillEntity.setWaybillId(waybillId);
 				billladingWaybillEntity.setWaybillNo(waybillNo);
 				billladingWaybillEntity.setRealNum(num);
+				billladingWaybillEntity.setRealVolume(BigDecimal.ZERO);
+				billladingWaybillEntity.setRealWeight(BigDecimal.ZERO);
 				billladingWaybillEntities.add(billladingWaybillEntity);
 				updateFeeBilllading.add(billladingEntity);
 			}
@@ -598,6 +605,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				details.add(warehouseWayBillDetail);
 			}
 			warehouseWaybillDetailClient.addList(details);
+
 		}else{
 			log.info("#################openZeroWaybill: 运单保存失败");
 			return R.fail(405,"运单保存失败");
@@ -631,6 +639,17 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		//创建零担订单
 		createStockArticle(waybillEntity);
 
+		//存入运单与订单关联信息
+		TrunklineWaybillOrderEntity trunklineWaybillOrderEntity = new TrunklineWaybillOrderEntity();
+		trunklineWaybillOrderEntity.setWarehouseId(warehouseId);
+		trunklineWaybillOrderEntity.setWarehouseName(basicdataWarehouseEntity.getName());
+		trunklineWaybillOrderEntity.setWaybillId(waybillId);
+		trunklineWaybillOrderEntity.setWaybillNo(waybillNo);
+		trunklineWaybillOrderEntity.setOrderCode(waybillNo);
+		trunklineWaybillOrderEntity.setTotalNumber(waybillEntity.getTotalCount());
+		trunklineWaybillOrderEntity.setHandleNumber(waybillEntity.getTotalCount());
+		trunklineWaybillOrderService.save(trunklineWaybillOrderEntity);
+
 		return R.success("开单成功");
 	}
 
@@ -763,6 +782,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 
 	private void createStockArticle(WarehouseWaybillEntity warehouseWaybill) {
+		Long departureWarehouseId = warehouseWaybill.getDepartureWarehouseId();
+		String departureWarehouseName = warehouseWaybill.getDepartureWarehouseName();
+		Long destinationWarehouseId = warehouseWaybill.getDestinationWarehouseId();
+		String destinationWarehouseName = warehouseWaybill.getDestinationWarehouseName();
 		Date date = new Date();
 		DistributionStockArticleEntity distributionStockArticleEntity = new DistributionStockArticleEntity();
 		distributionStockArticleEntity.setOrderCode(warehouseWaybill.getWaybillNo());
@@ -816,10 +839,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		distributionStockArticleEntity.setConsigneeMobile(warehouseWaybill.getConsigneeMobile());
 		distributionStockArticleEntity.setConsigneeAddress(warehouseWaybill.getConsigneeAddress());
 		distributionStockArticleEntity.setWarehouseEntryTimeEnd(date);
-		distributionStockArticleEntity.setSendWarehouseId(warehouseWaybill.getDepartureWarehouseId());
-		distributionStockArticleEntity.setSendWarehouseName(warehouseWaybill.getDepartureWarehouseName());
-		distributionStockArticleEntity.setAcceptWarehouseId(warehouseWaybill.getDestinationWarehouseId());
-		distributionStockArticleEntity.setAcceptWarehouseName(warehouseWaybill.getDestinationWarehouseName());
+		distributionStockArticleEntity.setSendWarehouseId(departureWarehouseId);
+		distributionStockArticleEntity.setSendWarehouseName(departureWarehouseName);
+		distributionStockArticleEntity.setAcceptWarehouseId(destinationWarehouseId);
+		distributionStockArticleEntity.setAcceptWarehouseName(destinationWarehouseName);
 		distributionStockArticleEntity.setIsZero("1");
 
 		Long orderId = distributionStockArticleClient.addData(distributionStockArticleEntity);
@@ -847,12 +870,20 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			entity.setOrderPackageStockupStatus("10");
 			entity.setOrderPackageReservationStatus("10");
 			entity.setOrderPackageLoadingStatus("10");
-			entity.setWaybillNumber(distributionStockArticleEntity.getWaybillNumber());
+			entity.setWaybillId(warehouseWaybill.getId()+"");
+			entity.setWaybillNumber(warehouseWaybill.getWaybillNo());
+			entity.setIsZero("1");
 			entity.setWarehouseEntryTimeEnd(date);
-			entity.setSendWarehouseId(warehouseWaybill.getDepartureWarehouseId());
-			entity.setSendWarehouseName(warehouseWaybill.getDepartureWarehouseName());
-			entity.setAcceptWarehouseId(warehouseWaybill.getDestinationWarehouseId());
-			entity.setAcceptWarehouseName(warehouseWaybill.getDestinationWarehouseName());
+			entity.setSendWarehouseId(departureWarehouseId);
+			entity.setSendWarehouseName(departureWarehouseName);
+			entity.setAcceptWarehouseId(destinationWarehouseId);
+			entity.setAcceptWarehouseName(destinationWarehouseName);
+			if(departureWarehouseId.equals(destinationWarehouseId)){
+				entity.setIsTransfer(0);
+			}else{
+				entity.setIsTransfer(1);
+			}
+
 			Long aLong = distributionParcelListClient.addReturnId(entity);
 
 			DistributionParcelNumberEntity parcelNumberEntity = new DistributionParcelNumberEntity();
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
index 9fcd0db12..b177b2402 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
@@ -71,4 +71,9 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 		queryWrapper.eq("order_package_code",orderPackageCode);
 		return baseMapper.selectOne(queryWrapper);
 	}
+
+	@Override
+	public Integer getIncomingNum(Long advanceId) {
+		return baseMapper.getIncomingNum(advanceId);
+	}
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
index e4b9ae0a7..054f00cf9 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
@@ -21,11 +21,14 @@ import com.logpm.trunkline.service.ITrunklineAdvanceService;
 import com.logpm.trunkline.vo.CustomerInfoVO;
 import com.logpm.trunkline.vo.OpenOrderVO;
 import com.logpm.trunkline.vo.TrunklineAdvanceVO;
+import com.logpm.warehouse.entity.WarehouseWaybillEntity;
+import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.TenantNum;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -44,6 +47,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 	private final IBasicdataStoreBusinessClient basicdataStoreBusinessClient;
 	private final IBasicMaterialClient basicMaterialClient;
 	private final IBasicdataTripartiteMallClient tripartiteMallClient;
+	private final IWarehouseWaybillClient warehouseWaybillClient;
 
 
 	@Override
@@ -75,6 +79,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		//2.查询订单信息
 		int total = baseMapper.getAllTotalNum(orderCode);
 
+		Date date = new Date();
 		Long orderId = null;
 		DistributionStockArticleEntity stockArticleEntity = stockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId);
 		if(Objects.isNull(stockArticleEntity)){
@@ -92,6 +97,8 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 			stockArticleEntity.setWarehouseId(warehouseId);
 			stockArticleEntity.setBrand(advanceEntity.getBrand());
 			stockArticleEntity.setDescriptionGoods(advanceEntity.getPackName());
+			stockArticleEntity.setWarehouseEntryTime(date);
+			stockArticleEntity.setGenre(1);
 
 			String dealerName = advanceEntity.getDealerName();//暂存单经销商名称
 			stockArticleEntity.setDealerCode(advanceEntity.getDealerCode());
@@ -170,7 +177,18 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		DistributionParcelListEntity parcelList = new DistributionParcelListEntity();
 		parcelList.setWarehouse(warehouseEntity.getName());
 		parcelList.setWarehouseId(warehouseId);
-		parcelList.setWaybillNumber(advanceEntity.getWaybillNo());
+		String waybillNo = advanceEntity.getWaybillNo();
+		if(StringUtil.isNotBlank(waybillNo)){
+			WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
+			if(!Objects.isNull(waybillEntity)){
+				parcelList.setWaybillId(waybillEntity.getId()+"");
+				parcelList.setWaybillNumber(waybillEntity.getWaybillNo());
+				parcelList.setSendWarehouseId(waybillEntity.getDepartureWarehouseId());
+				parcelList.setSendWarehouseName(waybillEntity.getDepartureWarehouseName());
+				parcelList.setAcceptWarehouseId(waybillEntity.getDestinationWarehouseId());
+				parcelList.setAcceptWarehouseName(waybillEntity.getDestinationWarehouseName());
+			}
+		}
 		parcelList.setConditions(1);
 		parcelList.setOrderPackageCode(advanceDetailEntity.getOrderPackageCode());
 		parcelList.setFirsts(advanceDetailEntity.getFirstPackName());
@@ -180,6 +198,8 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		parcelList.setStockArticleId(orderId);
 		parcelList.setOrderCode(orderCode);
 		parcelList.setServiceNumber(advanceDetailEntity.getServiceNum());
+		parcelList.setIsTransfer(1);
+		parcelList.setAdvanceId(advanceId);
 
 		Long materialId = advanceDetailEntity.getMaterialId();
 		String materialCode = advanceDetailEntity.getMaterialCode();
@@ -203,13 +223,12 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 
 		}
 		parcelList.setBrandName(advanceDetailEntity.getBrand());
-		parcelList.setOrderPackageStatus("30");
+		parcelList.setOrderPackageStatus("20");
 		parcelList.setOrderPackageFreezeStatus("10");
 		parcelList.setOrderPackageGroundingStatus("10");
 		parcelList.setOrderPackageStockupStatus("10");
 		parcelList.setOrderPackageReservationStatus("10");
 		parcelList.setOrderPackageLoadingStatus("10");
-		Date date = new Date();
 		parcelList.setWarehouseEntryTimeEnd(date);
 		parcelList.setDealerCode(stockArticleEntity.getDealerCode());
 		parcelList.setDealerName(stockArticleEntity.getDealerName());
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 afbd2821b..75ff26897 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
@@ -10,10 +10,7 @@ import com.logpm.trunkline.dto.BillladingWaybillDTO;
 import com.logpm.trunkline.entity.*;
 import com.logpm.trunkline.mapper.TrunklineBillladingMapper;
 import com.logpm.trunkline.service.*;
-import com.logpm.trunkline.vo.TrunklineBillladingLineVO;
-import com.logpm.trunkline.vo.TrunklineBillladingPackageVO;
-import com.logpm.trunkline.vo.TrunklineBillladingVO;
-import com.logpm.trunkline.vo.TrunklineBillladingWaybillVO;
+import com.logpm.trunkline.vo.*;
 import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import com.logpm.warehouse.vo.WarehouseWaybillVO;
@@ -532,4 +529,35 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 		List<JSONObject> ls = basicdataCarrierClient.findCarrierByName(carrierName);
 		return R.data(ls);
 	}
+
+	@Override
+	public IPage<TrunklineBillladingDetailVO> billladingList(BillladingDTO billladingDTO) {
+		Integer pageNum = billladingDTO.getPageNum();
+		Integer pageSize = billladingDTO.getPageSize();
+		String startDateStr = billladingDTO.getStartDateStr();
+		String endDateStr = billladingDTO.getEndDateStr();
+		Long warehouseId = billladingDTO.getWarehouseId();
+
+		IPage<Object> page = new Page<>();
+		page.setCurrent(pageNum);
+		page.setSize(pageSize);
+
+		IPage<TrunklineBillladingDetailVO> ls =  baseMapper.billladingList(page,warehouseId,CommonUtil.getStartByDateStr(startDateStr),CommonUtil.getEndByDateStr(endDateStr));
+
+		return ls;
+	}
+
+	@Override
+	public IPage<TrunklineBillladingDetailListVO> findAdvanceDetailList(BillladingDTO billladingDTO) {
+		Integer pageNum = billladingDTO.getPageNum();
+		Integer pageSize = billladingDTO.getPageSize();
+		String orderCode = billladingDTO.getOrderCode();
+		IPage<Object> page = new Page<>();
+		page.setCurrent(pageNum);
+		page.setSize(pageSize);
+
+		IPage<TrunklineBillladingDetailListVO> ls =  baseMapper.findAdvanceDetailList(page,orderCode);
+
+		return ls;
+	}
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingWaybillServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingWaybillServiceImpl.java
index a0ca119a5..594e8affd 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingWaybillServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingWaybillServiceImpl.java
@@ -74,23 +74,17 @@ public class TrunklineBillladingWaybillServiceImpl extends BaseServiceImpl<Trunk
 
 		BigDecimal price = BigDecimal.ZERO;
 		if("1".equals(chargeType)){
-			if(realVolume.compareTo(BigDecimal.ZERO) > 0){
+			if(realNum > 0){
 				price = totalFee.divide(new BigDecimal(realNum),2,BigDecimal.ROUND_UP);
-			}else{
-				price = BigDecimal.ZERO;
 			}
 
 		}else if ("2".equals(chargeType)){
-			if(realVolume.compareTo(BigDecimal.ZERO) > 0){
+			if(realWeight.compareTo(BigDecimal.ZERO) > 0){
 				price = totalFee.divide(realWeight,4,BigDecimal.ROUND_UP);
-			}else{
-				price = BigDecimal.ZERO;
 			}
 		}else if("3".equals(chargeType)){
 			if(realVolume.compareTo(BigDecimal.ZERO) > 0){
 				price = totalFee.divide(realVolume,4,BigDecimal.ROUND_UP);
-			}else{
-				price = BigDecimal.ZERO;
 			}
 		}
 
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index d96edfbb0..aa2a7de96 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -1001,6 +1001,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			distributionStockArticleClient.addCarsLoadNum(planNum,orderCode,warehouseId);
 		}
 
+		//更新数值
+		updateNumByLoadId(loadId);
 
 		return R.success("添加成功");
 	}
@@ -1038,28 +1040,33 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	public R removeCarsOrderByCarsOrderId(LoadCarsDTO loadCarsDTO) {
 		log.info("################removeCarsOrderByCarsOrderId: 删除调度池订单");
 
-		Long carsOrderId = loadCarsDTO.getCarsOrderId();
+		String carsOrderIds = loadCarsDTO.getCarsOrderIds();
 		Long warehouseId = loadCarsDTO.getWarehouseId();
-		//先查询调度池订单
-		TrunklineCarsOrderEntity carsOrderEntity = trunklineCarsOrderService.getById(carsOrderId);
-		if(Objects.isNull(carsOrderEntity)){
-			log.warn("##############removeCarsOrderByCarsOrderId: 调度池订单信息不存在 carsOrderId={}",carsOrderId);
-			return R.fail(400,"调度池订单信息不存在");
-		}
-		Long nodeId = carsOrderEntity.getNodeId();
-		if(!nodeId.equals(warehouseId)){
-			log.warn("##############removeCarsOrderByCarsOrderId: 暂不能删除其他节点的数据 nodeId={} warehouseId={}",nodeId,warehouseId);
-			return R.fail(400,"暂不能删除其他节点的数据");
-		}
-		Long loadId = carsOrderEntity.getLoadId();
-		Integer realNum = carsOrderEntity.getRealNum();
-		if(realNum > 0){
-			log.warn("##############removeCarsOrderByCarsOrderId: 订单已有装车数据 carsOrderId={} realNum={}",carsOrderId,realNum);
-			return R.fail(400,"订单已有装车数据");
-		}
 
-		trunklineCarsOrderService.deleteByCarsOrderId(carsOrderId);
-		updateNumByLoadId(loadId);
+		String[] split = carsOrderIds.split(",");
+		for (String carsOrderIdStr : split) {
+			Long carsOrderId = Long.parseLong(carsOrderIdStr);
+			//先查询调度池订单
+			TrunklineCarsOrderEntity carsOrderEntity = trunklineCarsOrderService.getById(carsOrderId);
+			if(Objects.isNull(carsOrderEntity)){
+				log.warn("##############removeCarsOrderByCarsOrderId: 调度池订单信息不存在 carsOrderId={}",carsOrderId);
+				return R.fail(400,"调度池订单信息不存在");
+			}
+			Long nodeId = carsOrderEntity.getNodeId();
+			if(!nodeId.equals(warehouseId)){
+				log.warn("##############removeCarsOrderByCarsOrderId: 暂不能删除其他节点的数据 nodeId={} warehouseId={}",nodeId,warehouseId);
+				return R.fail(400,"暂不能删除其他节点的数据");
+			}
+			Long loadId = carsOrderEntity.getLoadId();
+			Integer realNum = carsOrderEntity.getRealNum();
+			if(realNum > 0){
+				log.warn("##############removeCarsOrderByCarsOrderId: 订单已有装车数据 carsOrderId={} realNum={}",carsOrderId,realNum);
+				return R.fail(400,"订单已有装车数据");
+			}
+
+			trunklineCarsOrderService.deleteByCarsOrderId(carsOrderId);
+			updateNumByLoadId(loadId);
+		}
 
 		return R.success("删除成功");
 	}
@@ -1559,7 +1566,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId);
 			if(Objects.isNull(stockArticleEntity)){
 				log.warn("##################loadingScan: 订单信息不存在 orderCode={} warehouseId={}",orderCode,warehouseId);
-				return R.fail(405,"订单信息不存在");
+				return R.fail(405,"订单暂未开单");
 			}
 			Long articleId = stockArticleEntity.getId();
 
@@ -1638,7 +1645,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
 		if(Objects.isNull(basicdataWarehouseEntity)){
 			log.warn("##################loadingZero: 仓库信息不存在 warehouseId={}",warehouseId);
-			return R.fail(405,"仓库信息不存在");
+			return R.fail(405,"订单暂未开单");
 		}
 		String warehouseName = basicdataWarehouseEntity.getName();
 
@@ -2357,6 +2364,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		//删除
 		boolean b = trunklineCarsLoadScanService.deleteEntityByCarsLoadScanId(carsLoadScanId);
 		if(b){
+			updateNumByLoadId(loadId);
 			Integer isAbnormal = carsLoadScanEntity.getLoadingAbnormal();
 			Integer isData = carsLoadScanEntity.getIsData();
 			Integer num = carsLoadScanEntity.getNum();
@@ -2399,7 +2407,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				}
 			}
 		}
-		updateNumByLoadId(loadId);
+//		updateNumByLoadId(loadId);
 
 		return R.success("删除成功");
 	}
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
index 2b24c07de..5432f3fc4 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
@@ -7,14 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.logpm.basic.entity.BasicMaterialEntity;
 import com.logpm.basic.feign.IBasicMaterialClient;
-import com.logpm.basicdata.entity.BasicdataClientEntity;
-import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity;
-import com.logpm.basicdata.entity.BasicdataTrayEntity;
-import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
-import com.logpm.basicdata.feign.IBasicdataClientClient;
-import com.logpm.basicdata.feign.IBasicdataStoreBusinessClient;
-import com.logpm.basicdata.feign.IBasicdataTrayClient;
-import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.basicdata.entity.*;
+import com.logpm.basicdata.feign.*;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.entity.DistributionStockListEntity;
@@ -123,6 +117,11 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 	private ITrunklineAdvanceClient trunklineAdvanceClient;
 	@Autowired
 	private BladeRedis redis;
+	@Autowired
+	private IBasicdataTripartiteMallClient basicdataTripartiteMallClient;
+	@Autowired
+	private IBasicdataStorageServicesClient basicdataStorageServicesClient;
+
 
 	@Override
 	public IPage<WarehouseTrayTypeVO> orderPageList(TrayTypeDTO trayTypeDTO,Long warehouseId) {
@@ -529,8 +528,26 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 				trayTypeEntity.setFilterId(stockArticleEntity.getId());
 				trayTypeEntity.setFilterValue(stockArticleEntity.getOrderCode());
 			}else if("30".equals(trayType)){//商场
-				trayTypeEntity.setFilterId(stockArticleEntity.getMallId());
-				trayTypeEntity.setFilterValue(stockArticleEntity.getMallName());
+				Long mallId = stockArticleEntity.getMallId();
+				if(!Objects.isNull(mallId)){
+					trayTypeEntity.setFilterId(stockArticleEntity.getMallId());
+					trayTypeEntity.setFilterValue(stockArticleEntity.getMallName());
+				}else{
+					String dealerName = stockArticleEntity.getDealerName();
+					String brand = stockArticleEntity.getBrand();
+					Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, brand);
+					if(!Objects.isNull(clientId)){
+						BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
+						if(Objects.isNull(basicdataClientEntity)){
+							log.error("#############saveTrayTypeByOrderPackageCode: 未找到三方商场对应的汇通商场 clientId={}",clientId);
+							throw new CustomerException(405,"未找到三方商场对应的汇通商场");
+						}
+						trayTypeEntity.setFilterId(basicdataClientEntity.getId());
+						trayTypeEntity.setFilterValue(basicdataClientEntity.getClientName());
+					}else{
+						trayTypeEntity.setFilterValue(dealerName);
+					}
+				}
 			}else if("40".equals(trayType)){//门店
 				trayTypeEntity.setFilterId(stockArticleEntity.getStoreId());
 				trayTypeEntity.setFilterValue(stockArticleEntity.getStoreName());
@@ -568,7 +585,24 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			}
 		}else if("30".equals(tt)){//商场
 			Long mallId = stockArticleEntity.getMallId();
-			String mallName = stockArticleEntity.getMallName();
+			String mallName = null;
+			if(!Objects.isNull(mallId)){
+				mallName = stockArticleEntity.getMallName();
+			}else{
+				String dealerName = stockArticleEntity.getDealerName();
+				String brand = stockArticleEntity.getBrand();
+				Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, brand);
+				if(!Objects.isNull(clientId)){
+					BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
+					if(Objects.isNull(basicdataClientEntity)){
+						log.error("#############saveTrayTypeByOrderPackageCode: 未找到三方商场对应的汇通商场 clientId={}",clientId);
+						throw new CustomerException(405,"未找到三方商场对应的汇通商场");
+					}
+					mallName = basicdataClientEntity.getClientName();
+				}else{
+					mallName = dealerName;
+				}
+			}
 			if(!filterValue.equals(mallName)){
 				chuanFlag = true;
 				msg = "商场"+filterValue;
@@ -588,7 +622,31 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 				msg = "客户"+filterValue;
 			}
 		}else if("60".equals(tt)){//仓库
-			String warehouse = stockArticleEntity.getWarehouse();
+			String warehouse = null;
+			String waybillNumber = parcelListEntity.getWaybillNumber();
+			if(StringUtil.isBlank(waybillNumber)){
+				//如果运单为空则去找有没有对应的dealName是否有对应的维护的商场信息
+				String brand = stockArticleEntity.getBrand();
+				String dealerName = parcelListEntity.getDealerName();
+				Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, brand);
+				if(!Objects.isNull(clientId)){
+					BasicdataStorageServicesEntity storageServicesEntity = basicdataStorageServicesClient.findEntityBySendWarehouseIdAndClientId(warehouseId, clientId);
+					if(!Objects.isNull(storageServicesEntity)){
+						warehouse = storageServicesEntity.getServeWarehouseName();
+					}else{
+						warehouse = "";
+					}
+				}else{
+					warehouse = "";
+				}
+			}else{
+				WarehouseWaybillEntity waybillEntity = warehouseWaybillService.findByWaybillNo(waybillNumber);
+				if(!Objects.isNull(waybillEntity)){
+					warehouse = waybillEntity.getDestinationWarehouseName();
+				}else{
+					warehouse = "";
+				}
+			}
 			if(!filterValue.equals(warehouse)){
 				chuanFlag = true;
 				msg = "仓库"+filterValue;
@@ -726,16 +784,31 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 				trayTypeEntity.setFilterId(stockArticleEntity.getId());
 				trayTypeEntity.setFilterValue(stockArticleEntity.getOrderCode());
 			}else if("30".equals(trayType)){//商场
-				trayTypeEntity.setFilterId(stockArticleEntity.getMallId());
-				trayTypeEntity.setFilterValue(stockArticleEntity.getMallName());
+				Long mallId = stockArticleEntity.getMallId();
+				if(!Objects.isNull(mallId)){
+					trayTypeEntity.setFilterId(stockArticleEntity.getMallId());
+					trayTypeEntity.setFilterValue(stockArticleEntity.getMallName());
+				}else{
+					String dealerName = stockArticleEntity.getDealerName();
+					String brand = stockArticleEntity.getBrand();
+					Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, brand);
+					if(!Objects.isNull(clientId)){
+						BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
+						if(Objects.isNull(basicdataClientEntity)){
+							log.error("#############saveTrayTypeByOrderPackageCode: 未找到三方商场对应的汇通商场 clientId={}",clientId);
+							throw new CustomerException(405,"未找到三方商场对应的汇通商场");
+						}
+						trayTypeEntity.setFilterId(basicdataClientEntity.getId());
+						trayTypeEntity.setFilterValue(basicdataClientEntity.getClientName());
+					}else{
+						trayTypeEntity.setFilterValue(dealerName);
+					}
+				}
 			}else if("40".equals(trayType)){//门店
 				trayTypeEntity.setFilterId(stockArticleEntity.getStoreId());
 				trayTypeEntity.setFilterValue(stockArticleEntity.getStoreName());
 			}else if("50".equals(trayType)){//客户
 				trayTypeEntity.setFilterValue(stockArticleEntity.getCustomerName()+stockArticleEntity.getCustomerTelephone());
-			}else if("60".equals(trayType)){//仓库
-				trayTypeEntity.setFilterId(stockArticleEntity.getWarehouseId());
-				trayTypeEntity.setFilterValue(stockArticleEntity.getWarehouse());
 			}
 			updateById(trayTypeEntity);
 		}
@@ -765,7 +838,24 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			}
 		}else if("30".equals(tt)){//商场
 			Long mallId = stockArticleEntity.getMallId();
-			String mallName = stockArticleEntity.getMallName();
+			String mallName = null;
+			if(!Objects.isNull(mallId)){
+				mallName = stockArticleEntity.getMallName();
+			}else{
+				String dealerName = stockArticleEntity.getDealerName();
+				String brand = stockArticleEntity.getBrand();
+				Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, brand);
+				if(!Objects.isNull(clientId)){
+					BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
+					if(Objects.isNull(basicdataClientEntity)){
+						log.error("#############saveTrayTypeByOrderPackageCode: 未找到三方商场对应的汇通商场 clientId={}",clientId);
+						throw new CustomerException(405,"未找到三方商场对应的汇通商场");
+					}
+					mallName = basicdataClientEntity.getClientName();
+				}else{
+					mallName = dealerName;
+				}
+			}
 			if(!filterValue.equals(mallName)){
 				chuanFlag = true;
 				msg = "商场"+filterValue;
@@ -785,7 +875,31 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 				msg = "客户"+filterValue;
 			}
 		}else if("60".equals(tt)){//仓库
-			String warehouse = stockArticleEntity.getWarehouse();
+			String warehouse = null;
+			String waybillNumber = parcelListEntity.getWaybillNumber();
+			if(StringUtil.isBlank(waybillNumber)){
+				//如果运单为空则去找有没有对应的dealName是否有对应的维护的商场信息
+				String brand = stockArticleEntity.getBrand();
+				String dealerName = parcelListEntity.getDealerName();
+				Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, brand);
+				if(!Objects.isNull(clientId)){
+					BasicdataStorageServicesEntity storageServicesEntity = basicdataStorageServicesClient.findEntityBySendWarehouseIdAndClientId(warehouseId, clientId);
+					if(!Objects.isNull(storageServicesEntity)){
+						warehouse = storageServicesEntity.getServeWarehouseName();
+					}else{
+						warehouse = "";
+					}
+				}else{
+					warehouse = "";
+				}
+			}else{
+				WarehouseWaybillEntity waybillEntity = warehouseWaybillService.findByWaybillNo(waybillNumber);
+				if(!Objects.isNull(waybillEntity)){
+					warehouse = waybillEntity.getDestinationWarehouseName();
+				}else{
+					warehouse = "";
+				}
+			}
 			if(!filterValue.equals(warehouse)){
 				chuanFlag = true;
 				msg = "仓库"+filterValue;
@@ -1001,16 +1115,61 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			trayTypeEntity.setFilterId(stockArticleEntity.getId());
 			trayTypeEntity.setFilterValue(stockArticleEntity.getOrderCode());
 		}else if("30".equals(trayType)){//商场
-			trayTypeEntity.setFilterId(stockArticleEntity.getMallId());
-			trayTypeEntity.setFilterValue(stockArticleEntity.getMallName());
+			Long mallId = stockArticleEntity.getMallId();
+			if(!Objects.isNull(mallId)){
+				trayTypeEntity.setFilterId(stockArticleEntity.getMallId());
+				trayTypeEntity.setFilterValue(stockArticleEntity.getMallName());
+			}else{
+				String dealerName = stockArticleEntity.getDealerName();
+				String brand = stockArticleEntity.getBrand();
+				Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, brand);
+				if(!Objects.isNull(clientId)){
+					BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
+					if(Objects.isNull(basicdataClientEntity)){
+						log.error("#############saveTrayTypeByOrderPackageCode: 未找到三方商场对应的汇通商场 clientId={}",clientId);
+						throw new CustomerException(405,"未找到三方商场对应的汇通商场");
+					}
+					trayTypeEntity.setFilterId(basicdataClientEntity.getId());
+					trayTypeEntity.setFilterValue(basicdataClientEntity.getClientName());
+				}else{
+					trayTypeEntity.setFilterValue(dealerName);
+				}
+			}
 		}else if("40".equals(trayType)){//门店
 			trayTypeEntity.setFilterId(stockArticleEntity.getStoreId());
 			trayTypeEntity.setFilterValue(stockArticleEntity.getStoreName());
 		}else if("50".equals(trayType)){//客户
 			trayTypeEntity.setFilterValue(stockArticleEntity.getCustomerName()+stockArticleEntity.getCustomerTelephone());
 		}else if("60".equals(trayType)){//仓库
-			trayTypeEntity.setFilterId(stockArticleEntity.getWarehouseId());
-			trayTypeEntity.setFilterValue(stockArticleEntity.getWarehouse());
+			String waybillNumber = parcelListEntity.getWaybillNumber();
+			if(StringUtil.isBlank(waybillNumber)){
+				//如果运单为空则去找有没有对应的dealName是否有对应的维护的商场信息
+				String brand = stockArticleEntity.getBrand();
+				String dealerName = parcelListEntity.getDealerName();
+				Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, brand);
+				if(!Objects.isNull(clientId)){
+					BasicdataStorageServicesEntity storageServicesEntity = basicdataStorageServicesClient.findEntityBySendWarehouseIdAndClientId(warehouseId, clientId);
+					if(!Objects.isNull(storageServicesEntity)){
+						trayTypeEntity.setFilterId(storageServicesEntity.getServeWarehouseId());
+						trayTypeEntity.setFilterValue(storageServicesEntity.getServeWarehouseName());
+					}else{
+						trayTypeEntity.setFilterId(null);
+						trayTypeEntity.setFilterValue("");
+					}
+				}else{
+					trayTypeEntity.setFilterId(null);
+					trayTypeEntity.setFilterValue("");
+				}
+			}else{
+				WarehouseWaybillEntity waybillEntity = warehouseWaybillService.findByWaybillNo(waybillNumber);
+				if(!Objects.isNull(waybillEntity)){
+					trayTypeEntity.setFilterId(waybillEntity.getDestinationWarehouseId());
+					trayTypeEntity.setFilterValue(waybillEntity.getDestinationWarehouseName());
+				}else{
+					trayTypeEntity.setFilterId(null);
+					trayTypeEntity.setFilterValue("");
+				}
+			}
 		}
 		save(trayTypeEntity);
 
diff --git a/blade-service/logpm-warehouse/src/main/resources/application-dev.yml b/blade-service/logpm-warehouse/src/main/resources/application-dev.yml
index 2d555bc62..401f7ed83 100644
--- a/blade-service/logpm-warehouse/src/main/resources/application-dev.yml
+++ b/blade-service/logpm-warehouse/src/main/resources/application-dev.yml
@@ -12,7 +12,7 @@ server:
 spring:
   #rabbitmq配置
   rabbitmq:
-    host: 192.168.10.100
+    host: 192.168.10.46
     port: 5672
     username: admin
     password: admin