diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java index f7773a3e8..0968fd66b 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java @@ -118,7 +118,7 @@ public interface IDistributionDeliveryListClient { * @return */ @GetMapping(TOP+"/maintenanceDeliveryInfo") - void maintenanceDeliveryInfo(@RequestParam("deliveryId")Long deliveryId); + void maintenanceDeliveryInfo(@RequestParam("deliveryId")String deliveryId); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java index 8f9f6d325..52cf2358b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java @@ -90,12 +90,12 @@ public class DistributionDeliveryListClient implements IDistributionDeliveryList } /** - * @param deliveryId + * @param deliveryIds * @return */ @Override - public void maintenanceDeliveryInfo(Long deliveryId) { - distributionDeliveryListService.maintenanceDeliveryInfoAndDeliveryStatus(deliveryId); + public void maintenanceDeliveryInfo(String deliveryIds) { + distributionDeliveryListService.maintenanceDeliveryInfoAndDeliveryStatus(deliveryIds); } 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 d29ad04e6..9bd8b0a27 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 @@ -211,7 +211,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 - 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 AND lddl.customers_number > 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 AND (lddl.customers_number > 0 AND ldr.reservation_num + ldr.reservation_stock_list_num) >0 and lddl.train_number like concat('%',#{param.trainNumber},'%') @@ -2019,7 +2019,7 @@ FROM logpm_distribution_signfor WHERE - delivery_id = #{deliveryId}}) + delivery_id = #{deliveryId}) AND reservation_num > 0 AND stock_article_status IN ('1','3') diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java index e903400fb..1fdec77d9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java @@ -428,9 +428,9 @@ public interface IDistributionDeliveryListService extends BaseService collect = distributionReservationEntities.stream().filter(f -> (f.getReservationNum() + f.getReservationStockListNum()) > 0).collect(Collectors.toList()); log.info(deliveryListEntity.getTrainNumber()+"#################维护配送任务客户数>>>>>>>,:{}",collect.size()); @@ -6824,13 +6827,18 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl maintenanceDeliveryStatus(String params) { //维护配送的状态 - Integer row = iSyncDistributionParcelListService.updateCompleteDeliveryStatus(); + String method = "######################DistributionDatarepair.maintenanceDeliveryStatus"; + log.info(method+"维护配送订单id:{}",params); + deliveryListClient.maintenanceDeliveryInfo(params); + log.info(method+"维护配送订单结束"); return ReturnT.SUCCESS; }