维护配送任务信息和状态补丁

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java

@@ -111,6 +111,16 @@ public interface IDistributionDeliveryListClient {
 	List<AftersalesAbnormalPackageVO> aftersalesPackageScan(@RequestParam("deliveryId")Long deliveryId,@RequestParam("scanBarCode")String scanBarCode);
 
 
+	/**
+	 * 维护指定配送车次任务信息
+	 * @param deliveryId
+	 * @param deliveryId
+	 * @return
+	 */
+	@GetMapping(TOP+"/maintenanceDeliveryInfo")
+	void maintenanceDeliveryInfo(@RequestParam("deliveryId")Long deliveryId);
+
+
 
 //    /**
 //	 * 根据配送任务ID查询配送司机信息

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java

@@ -89,5 +89,14 @@ public class DistributionDeliveryListClient implements IDistributionDeliveryList
 		return distributionDeliveryListService.aftersalesPackageScan(deliveryId,scanBarCode);
 	}
 
+	/**
+	 * @param deliveryId
+	 * @return
+	 */
+	@Override
+	public void maintenanceDeliveryInfo(Long deliveryId) {
+		distributionDeliveryListService.maintenanceDeliveryInfoAndDeliveryStatus(deliveryId);
+	}
+
 
 }

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

@@ -426,8 +426,14 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 */
     DistributionDeliveryListEntity selectDeliveryByTrainNumber(String searchCode);
 
+	/**
+	 * 维护配送信息和状态
+	 * @param deliveryId
+	 */
+	void maintenanceDeliveryInfoAndDeliveryStatus(Long deliveryId);
 
-    /**
+
+	/**
 	 * 查询签收预约客户包件信息
 	 * @param reservationId
 	 * @param scanBarCode

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

@@ -6823,6 +6823,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		return baseMapper.selectDeliveryByTrainNumber(myCurrentWarehouse.getId(),searchCode);
 	}
 
+	/**
+	 * @param deliveryId
+	 */
+	@Override
+	@Transactional
+	public void maintenanceDeliveryInfoAndDeliveryStatus(Long deliveryId) {
+		this.maintenanceDeliveryNum(deliveryId);
+		this.maintenanceDeliveryInfo(deliveryId);
+
+	}
+
 	@Override
 	@Transactional
 	public void maintenanceDeliveryInfo(Long deliveryId) {
@@ -6880,6 +6891,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			throw new RuntimeException("查询配送客户信息失效!!!");
 		}
 
+
 //		if (list.size()>0) {
 //			//查看所有的签收信息是否均已完成
 //			boolean anyMatch = list.stream().allMatch(s -> s.getSigningStatus().equals(SignforStatusConstant.yiqianshou.getValue()));