From 7630e223694f7ed31c3672827964dd13aaeb7678 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 21 Dec 2023 16:35:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E3=80=81=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=A2=A6=E5=A4=A9=E5=B7=A5=E5=8E=82=E7=AD=BE?= =?UTF-8?q?=E6=94=B6=E6=89=AB=E6=8F=8F=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factory/mt/feign/IMtOrderMainClinet.java | 8 ++++--- blade-service/logpm-distribution/pom.xml | 6 +++++ .../service/IDistributionAsyncService.java | 6 +++++ .../impl/DistributionAsyncServiceImpl.java | 24 ++++++++++++++++++- .../impl/DistributionSignforServiceImpl.java | 21 ++++++++++------ .../factory/mt/feign/MtOrderMainClinet.java | 3 ++- 6 files changed, 56 insertions(+), 12 deletions(-) diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/feign/IMtOrderMainClinet.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/feign/IMtOrderMainClinet.java index 5f5290ac6..ad6eac0ad 100644 --- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/feign/IMtOrderMainClinet.java +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/feign/IMtOrderMainClinet.java @@ -32,9 +32,11 @@ public interface IMtOrderMainClinet { */ @GetMapping(TOP) R sendOrderPackageScan(@RequestParam String orderPackageCode, - @RequestParam String operationTime, - @RequestParam String distributionContactId, - @RequestParam String destinationWarehouse) throws NoSuchAlgorithmException, JsonProcessingException; + @RequestParam String operationTime, + @RequestParam String distributionContactId, + @RequestParam String distributionContactCode, + @RequestParam String destinationWarehouse + ) throws NoSuchAlgorithmException, JsonProcessingException; /** diff --git a/blade-service/logpm-distribution/pom.xml b/blade-service/logpm-distribution/pom.xml index 17d3ae910..c4db43969 100644 --- a/blade-service/logpm-distribution/pom.xml +++ b/blade-service/logpm-distribution/pom.xml @@ -110,6 +110,12 @@ 3.2.0.RELEASE compile + + org.springblade + logpm-factory-api + ${bladex.project.version} + compile + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java index e5a8ab7c6..281e682c2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAsyncService.java @@ -271,4 +271,10 @@ public interface IDistributionAsyncService { * @param id */ void handlPakcage(List packageIds, Long id); + + /** + * 推送信息到工厂 + * @param distributionParcelListEntity + */ + void sendFactory(DistributionParcelListEntity distributionParcelListEntity,String signingTime,Long reservationId,String reservationCode,Long warehouseId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index eaf062e4f..b887489c6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -4,6 +4,7 @@ package com.logpm.distribution.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.fasterxml.jackson.core.JsonProcessingException; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.distribution.dto.DistributionLoadingNumDTO; @@ -18,6 +19,7 @@ import com.logpm.distribution.vo.DistributionParcelNumberVO; import com.logpm.distribution.vo.DistributionStockPackageVO; import com.logpm.distribution.vo.DistributionStockupSelfVO; import com.logpm.distribution.vo.DistrilbutionBillStockVO; +import com.logpm.factory.mt.feign.IMtOrderMainClinet; import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; @@ -46,6 +48,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; +import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -90,7 +93,8 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { private final IBasicdataWarehouseClient warehouseClient; private final IDistributionReservationZeroPackageService reservationZeroPackageService; private final IDistributionParcelNumberService distributionParcelNumberService; - +// private final IDistributionParcelNumberService distributionParcelNumberService; + private final IMtOrderMainClinet orderMainClinet; @Override @Async @@ -1385,6 +1389,24 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { } + @Override + public void sendFactory(DistributionParcelListEntity distributionParcelListEntity,String signingTime,Long reservationId,String reservationCode,Long warehouseId) { + DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(distributionParcelListEntity.getStockArticleId()); + if (Func.isNotEmpty(stockArticleEntity)){ + switch (stockArticleEntity.getBrand()){ + case "梦天": + //推送到梦天 + try { + orderMainClinet.sendOrderPackageScan(distributionParcelListEntity.getOrderPackageCode(),signingTime,reservationId.toString(),reservationCode,warehouseId.toString()); + } catch (Exception e) { + throw new RuntimeException(e); + } + break; + } + } + + } + /** * 维护配送数量和状态 * 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 75e2c7930..5d5521c9f 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 @@ -644,7 +644,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl list = disStockListDetailService.list(Wrappers.query().lambda() .eq(DisStockListDetailEntity::getStockPackageCode, distrilbutionloadingscanDTO.getBarcode()) .ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()) @@ -658,7 +662,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl parcelListEntityList = distributionReservationMapper.selectPackageListByReservationId(distrilbutionloadingscanDTO.getReservationId()); //查询该客户是否存在该包件信息 List collect = parcelListEntityList.stream().filter(p -> p.getOrderPackageCode().equals(distrilbutionloadingscanDTO.getBarcode())).collect(Collectors.toList()); @@ -675,7 +679,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl packageIds = new ArrayList<>(); if (Func.isNotEmpty(parcelListEntityList)) { for (DistributionParcelListEntity parcelListEntity : parcelListEntityList) { @@ -2294,7 +2299,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl