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 b7549d730..0a006ab58 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 @@ -297,5 +297,8 @@ public interface IDistributionParcelListClient { @PostMapping(API_PREFIX + "/findIdAndWarehouseIdListByAdvanceIds") List findIdAndWarehouseIdListByAdvanceIds(@RequestBody List advanceIds); + + @PostMapping(API_PREFIX + "/findIdAndWarehouseIdListByOrderCodes") + List findIdAndWarehouseIdListByOrderCodes(@RequestBody Set orderCodeSet); } 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 5a6260650..a49876954 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 @@ -631,4 +631,9 @@ public class DistributionParcelListClient implements IDistributionParcelListClie return distributionParcelListService.findIdAndWarehouseIdListByAdvanceIds(advanceIds); } + @Override + public List findIdAndWarehouseIdListByOrderCodes(Set orderCodeSet) { + return distributionParcelListService.findIdAndWarehouseIdListByOrderCodes(orderCodeSet); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java index f0f7433f4..04b1ff7bf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java @@ -331,4 +331,7 @@ public interface DistributionParcelListMapper extends BaseMapper pageOweZeroListTransfer(@Param("orderCode") String orderCode, @Param("waybillNumber") String waybillNumber); List selectParcelListListByAdvanceIds(@Param("advanceIds") List advanceIds); + + List findIdAndWarehouseIdListByOrderCodes(@Param("orderCodeSet") Set orderCodeSet); + } 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 918c7d9be..d01490a49 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 @@ -2228,4 +2228,19 @@ ) t on t.advanceId = ldpl.advance_id + + 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 96141a70d..c81662043 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 @@ -304,4 +304,5 @@ public interface IDistributionParcelListService extends BaseService findIdAndWarehouseIdListByAdvanceIds(List advanceIds); + List findIdAndWarehouseIdListByOrderCodes(Set orderCodeSet); } 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 5009e7165..26cf45986 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 @@ -1562,4 +1562,9 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl findIdAndWarehouseIdListByAdvanceIds(List advanceIds) { return baseMapper.selectParcelListListByAdvanceIds(advanceIds); } + + @Override + public List findIdAndWarehouseIdListByOrderCodes(Set orderCodeSet) { + return baseMapper.findIdAndWarehouseIdListByOrderCodes(orderCodeSet); + } } 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 a5eb4faad..7c8cb28db 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 @@ -219,8 +219,7 @@ 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 9804eff6d..8778caf9d 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 @@ -653,7 +653,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { //绑定订单和运单的关系 List advanceEntityList = advanceService.findListByIds(advanceIds); List waybillOrderEntities = new ArrayList<>(); + Set orderCodeSet = new HashSet<>(); for (TrunklineAdvanceEntity advanceEntity : advanceEntityList) { + orderCodeSet.add(advanceEntity.getOrderCode()); Long advanceId = advanceEntity.getId(); String waybillStatus = advanceEntity.getWaybillStatus(); if ("1".equals(waybillStatus)) { @@ -696,7 +698,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Long consigneeId1 = waybillEntity.getConsigneeId(); BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId1); - List parcelListEntities = distributionParcelListClient.findIdAndWarehouseIdListByAdvanceIds(advanceIds); +// List parcelListEntities = distributionParcelListClient.findIdAndWarehouseIdListByAdvanceIds(advanceIds); + List parcelListEntities = distributionParcelListClient.findIdAndWarehouseIdListByOrderCodes(orderCodeSet); Set stockArticleIds = new TreeSet<>(); String finalWaybillNo = waybillNo; parcelListEntities.forEach(parcelListEntity -> { @@ -739,8 +742,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService { if(CollUtil.isNotEmpty(updateList)){ distributionStockArticleClient.updateByBatchId(updateList); } - - } trunklineWaybillPackageService.updateWaybillStatus(waybillEntity);