From 970391bdbb4f391a2a7de88ecffd5fc395a830fe Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sun, 28 Apr 2024 18:49:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=80=81=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E7=AD=BE=E6=94=B6=E6=97=B6=E9=97=B4=E3=80=81?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E8=AE=A1=E5=88=92=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/oldproject/dto/SignPushDataDTO.java | 5 +++++ .../mapper/DistributionDeliveryListMapper.xml | 1 + .../mapper/DistributionReservationMapper.xml | 2 +- .../impl/DistributionDeliveryListServiceImpl.java | 9 +++++++-- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java index ed7bacd15..8d3274728 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java @@ -125,6 +125,11 @@ public class SignPushDataDTO { */ private String kind; + /** + * 复核时间 + */ + private Date reviewTime; + /** * 签收客户集合 */ 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 4519138db..1e32d1365 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 @@ -1905,6 +1905,7 @@ lddl.kind AS kind, lddl.warehouse_id AS warehouseId, lddl.warehouse_name AS warehouseName, + lds.signing_time AS reviewTime, CASE lddl.type WHEN 1 THEN 2 WHEN 2 THEN 1 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index b2c7de152..ade2ad7f8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -1364,7 +1364,7 @@ ldr.delivery_phone AS phone, (ldr.reservation_num + ldr.reservation_stock_list_num) AS plan, (lds.loaded_number + lds.loadedin_number) AS actualPlan, - lddl.delivery_number AS delivery, + ldr.reservation_num AS delivery, (lds.received_quantity + lds.receivedin_quantity) AS sign, lds.signing_status AS state, lds.create_time AS createTime, 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 0a0fbddb9..fe50c8a64 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 @@ -4131,9 +4131,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl newReservationIds = reservationInfos.stream().map(DistributionReservationDTO::getId).collect(Collectors.toList()); List distributionReservationEntities = distributionReservationMapper.selectList(Wrappers.query().lambda().in(DistributionReservationEntity::getId, newReservationIds)); List needStockUpReservationList = distributionReservationEntities.stream().filter(r -> r.getStockupStatus().equals(ReservationStockupStatusConstant.weibeihuo.getValue())).collect(Collectors.toList()); + DistributionStockupEntity stockupEntity = null; BladeUser user = AuthUtil.getUser(); if (Func.isNotEmpty(needStockUpReservationList)) { + log.info("修改市配配送任务需要进行备货的预约计划>>>reservationCodes:{}",needStockUpReservationList.stream().map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(","))); //需要进行备货的预约列表 stockupEntity = new DistributionStockupEntity(); stockupEntity.setAssignStatus(StockAssignStatusConstant.weizhipai.getValue()); @@ -4159,6 +4161,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplupdate().lambda() + .eq(DistributionReservationEntity::getId,distributionReservationEntity.getId()) + .set(DistributionReservationEntity::getStockupStatus,ReservationStockupStatusConstant.daibeihuo.getValue()) + ); + log.info("编辑配送车次维护预约备货状态 reservationId>>>>>>>>>>>>>>>>>:{}",distributionReservationEntity.getId()); } } //这里暂时不考虑出现新增的情况 @@ -4194,8 +4201,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl