From 7e882d84840532fa0e3fc2e07fb093631e31e5a8 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 23 Aug 2024 09:39:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B9=B2=E7=BA=BF=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionSignforMapper.java | 8 ++- .../mapper/DistributionSignforMapper.xml | 70 +++++++++++++++++++ .../impl/DistributionSignforServiceImpl.java | 31 +++++++- 3 files changed, 106 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java index ccc5dc444..d9500b3f7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java @@ -31,6 +31,7 @@ import com.logpm.distribution.excel.DistributionSignforOwnExcel; import com.logpm.distribution.vo.*; import com.logpm.distribution.vo.app.*; import com.logpm.oldproject.dto.SignPushDataUnitDTO; +import com.logpm.trunkline.dto.WaybillLogDTO; import org.apache.ibatis.annotations.Param; import org.springblade.core.secure.BladeUser; @@ -411,5 +412,10 @@ public interface DistributionSignforMapper extends BaseMapper selectPushOldSingleInventoryPackageSigning(@Param("reservationId")Long reservationId,@Param("deliveryId") Long deliveryId,@Param("orderPackageCode") String orderPackageCode); - + /** + * 查询签收结果数据 + * @param reservationId + * @return + */ + List getWaybillSignforData(@Param("reservationId")Long reservationId,@Param("userId")Long userId,@Param("userName")String userName); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 1b19799da..262c1636d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1794,4 +1794,74 @@ AND ldl.is_deleted = 0 AND ldl.signfor_state = 2 + 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 ce014a193..09fd5a86a 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 @@ -56,6 +56,8 @@ import com.logpm.oldproject.feign.IOldSignPushClient; import com.logpm.oldproject.feign.IWarehouseClient; import com.logpm.trunkline.dto.WaybillLogDTO; import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient; +import com.logpm.trunkline.feign.ITrunklineWaybillOrderClient; +import com.logpm.trunkline.feign.ITrunklineWaybillTrackClient; import com.logpm.warehouse.feign.IWarehouseUpdownStockUpAreaClient; import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; import lombok.extern.slf4j.Slf4j; @@ -246,6 +248,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>> updateSign isSuccess ={}", isSuccess); buildArgsToPushMq(distributionSignfor); if (isSuccess) { + //整理签收数据回退干线 + handletrunklineWaybillSignLog(distributionSignfor.getReservationId()); + + + + + + this.updateById(distributionSignfor); // 创建异步队列推送老系统的的签收信息 构建请求参数 return R.status(true); } - WaybillLogDTO waybillLogDTO = new WaybillLogDTO(); - return R.status(false); + } + + /** + * 推送干线运单信息 + * @param reservationId + */ + private void handletrunklineWaybillSignLog(Long reservationId) { + List mapList = baseMapper.getWaybillSignforData(reservationId,AuthUtil.getUser().getUserId(),AuthUtil.getUser().getNickName()); + if (!mapList.isEmpty()) { + for (WaybillLogDTO waybillLogDTO : mapList) { + trunklineWaybillTrackClient.addSignWaybillLog(waybillLogDTO); + } + } + + + } /** From cebe554e20904eeb0950d8d50fda168a44ba0d2b Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 23 Aug 2024 10:42:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionReservationServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index b7b18d73e..a6ef6010d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -1251,7 +1251,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl reservationEntityList = baseMapper.selectList(Wrappers.query().lambda().eq(DistributionReservationEntity::getId, ids)); + List reservationEntityList = baseMapper.selectList(Wrappers.query().lambda() + .in(DistributionReservationEntity::getId, ids) + ); //判断是否存在预约进行了配送任务的提交 boolean match = reservationEntityList.stream().anyMatch(r -> ReservationStatusConstant.daipeisong.getValue().equals(r.getReservationStatus())); if (match) { @@ -1322,7 +1324,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl Date: Fri, 23 Aug 2024 10:44:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=8E=9F=E6=9D=A5?= =?UTF-8?q?=E7=9A=84=E9=A2=84=E7=BA=A6=E3=80=81=E5=A4=87=E8=B4=A7=E3=80=81?= =?UTF-8?q?=E8=BD=A6=E6=AC=A1=E7=9A=84=E5=8F=B7=E7=94=9F=E6=88=90=E8=A7=84?= =?UTF-8?q?=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListServiceImpl.java | 4 +-- .../DistributionReservationServiceImpl.java | 27 ++++++------------- .../impl/DistributionStockupServiceImpl.java | 2 +- 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 394b5a279..875a1a233 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -7410,7 +7410,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl ls = new ArrayList<>(); for (int i = 0; i < packageNum; i++) {