1.增加商家端预收货包件查询

2.增加审单的时候的查询 签收人 签收时间  配送司机 配送时间 签收件数

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java

@@ -547,6 +547,12 @@ public class WarehouseWaybillEntity extends TenantEntity {
 	@ApiModelProperty(value = "文员复核时间 ")
 	private Date signCheckTime;
 
+	@ApiModelProperty(value = "配送司机")
+	private String deliveryDriverName;
+
+	@ApiModelProperty(value = "配送时间")
+	private Date deliveryTime;
+
 	/**
 	 *付款状态：(null) 10  未付款  20 部分付款  30 已付款
 	 */

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java

@@ -84,11 +84,37 @@ public class FinanceWaybillVO implements Serializable {
 	private String goodsTypePickupPrice;
 	private String goodsTypeFreightPrice;
 	private Integer goodsTypeCount;
-
 	private String payStatus;
-
 	private String settlementStatus;
 
+	/**
+	 * 签收件数
+	 */
+	private Integer signCount;
+
+	/**
+	 * 签收人
+	 */
+	private String signUserName;
+
+	/**
+	 * 签收时间
+	 */
+	private Date signTime;
+
+	/**
+	 * 配送时间
+	 */
+	private Date deliveryTime;
+
+	/**
+	 * 配送司机
+	 */
+	private String deliveryDriverName;
+
+
+
+
 
 
 }

blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml

@@ -67,6 +67,9 @@
             <if test="param.trainNumber != null and param.trainNumber != ''">
                 AND  train_number like concat(#{param.trainNumber},'%')
             </if>
+            <if test="param.orderPackageCode != null and param.orderPackageCode != ''">
+                AND  order_package_code like concat(#{param.orderPackageCode},'%')
+            </if>
             <if test="param.orderCode != null and param.orderCode != ''">
                 AND  order_code like concat(#{param.orderCode},'%')
             </if>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/waybil/StatusLogListener.java

@@ -88,6 +88,7 @@ public class StatusLogListener {
 			t.setDeliveryTime(vo.getDeliveryTime());
 			t.setNum(waybillCountMap.get(waybillNumber));
 			t.setSignOrderCode(vo.getPickupBatch());
+
 			t.setType(3);
 			trunklineWaybillTrackClient.addSignWaybillLog(t);
 

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

@@ -64,7 +64,7 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl<TrunklineW
 
 				Integer packageStatus = trunklineWaybillPackageMapper.findMaxPackageStatus(waybillNo);
 
-				log.info(">>>>",packageStatus+" **");
+				log.info(">>>> {}",packageStatus+" **");
 
 				WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
 				if(Objects.isNull(warehouseWaybillEntity)){
@@ -84,6 +84,8 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl<TrunklineW
 				updateWaybill.setSignTime(signTime);
 				updateWaybill.setSignCheckUserName(nickName);
 				updateWaybill.setSignCheckTime(new Date());
+				updateWaybill.setDeliveryTime(waybillLogDTO.getDeliveryTime() == null?null:waybillLogDTO.getDeliveryTime());
+				updateWaybill.setDeliveryDriverName(waybillLogDTO.getDriverName()==null?"":waybillLogDTO.getDriverName());
 				warehouseWaybillClient.updateEntity(updateWaybill);
 				warehouseWaybillEntity.setSignNum(updateWaybill.getSignNum());
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml

@@ -506,7 +506,12 @@
         GROUP_CONCAT(concat(lwwd.product_name,'(',IFNULL(lwwd.freight_price,0),')')) goodsTypeFreightPrice,
         count(lwwd.id) goodsTypeCount,
         lww.pay_status,
-        lww.settlement_status
+        lww.settlement_status,
+        lww.sign_num as signCount,
+        lww.sign_user_name as signUserName,
+        lww.sign_time as signTime,
+        lww.delivery_time as deliveryTime,
+        lww.delivery_driver_name as deliveryDriverName
         from logpm_warehouse_waybill lww
         left join logpm_basicdata_client lbc on lbc.id = lww.consignee_id
         left join logpm_warehouse_waybill_detail lwwd on lwwd.waybill_id = lww.id and lwwd.is_deleted = 0