From 9ec4d79d3eb627218d0dbdc16c66fb6b83e088a3 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sat, 23 Mar 2024 11:31:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=8F=96=E6=B6=88=E9=A2=84=E7=BA=A6=E8=A1=A5?= =?UTF-8?q?=E4=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/IDistributionReservationClient.java | 8 +++++++ .../feign/DistributionReservationClient.java | 8 +++++++ .../IDistributionReservationService.java | 6 ++++++ .../DistributionReservationServiceImpl.java | 21 ++++++++++++++++++- .../jobhandle/DistributionDatarepair.java | 15 +++++++++++++ 5 files changed, 57 insertions(+), 1 deletion(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java index 6148b01fb..e305b927f 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java @@ -70,4 +70,12 @@ public interface IDistributionReservationClient { */ @GetMapping(TOP+"/maintenanceReservationInfo") R maintenanceReservationInfo(@RequestParam("warehouseId") String warehouseId); + + /** + * 维护取消预约信息 + * @param params + */ + @GetMapping(TOP+"/maintenanceCancelReservation") + void maintenanceCancelReservation(String params); + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java index 9439a4ec1..405a0fb90 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java @@ -69,5 +69,13 @@ public class DistributionReservationClient implements IDistributionReservationCl return reservationService.maintenanceReservationInfoByWarehouseId(warehouseId); } + /** + * @param params + */ + @Override + public void maintenanceCancelReservation(String params) { + reservationService.maintenanceCancelReservation(params); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java index 98488e776..117adfd2e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java @@ -290,4 +290,10 @@ public interface IDistributionReservationService extends BaseService selectStockupZeroOrderList(Long reservationId); + /** + * 维护取消预约信息 + * @param params + */ + void maintenanceCancelReservation(String params); + } 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 64bd08b9a..fc342bf49 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 @@ -2602,7 +2602,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl 0) { reservationStockarticleEntityList.forEach(rs -> { rs.setStockArticleStatus(ReservationOrderStatusConstant.quxiao.getValue()); - distributionReservationStockarticleService.updateById(rs); +// distributionReservationStockarticleService.updateById(rs); if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())) { //订制品 //需要进行包件的预约状态维护 @@ -2647,6 +2647,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl selectStockupZeroOrderList(Long reservationId) { return baseMapper.selectStockupZeroOrderList(reservationId); } + + /** + * @param params + */ + @Override + public void maintenanceCancelReservation(String params) { + LambdaQueryWrapper lambda = Wrappers.query().lambda(); + if (Func.isNotBlank(params)){ + List list = Func.toLongList(params); + lambda.eq(DistributionReservationEntity::getWarehouseId,list); + } + List reservationEntityList = this.list(lambda); + for (DistributionReservationEntity reservationEntity : reservationEntityList) { + this.maintenanceReservationInfo(reservationEntity.getId()); + } + + } } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java index 8e65ae0bc..b111d3935 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java @@ -124,6 +124,21 @@ public class DistributionDatarepair { } + /** + * 维护指定取消预约信息 + * @return + */ + @XxlJob("maintenanceCancelReservation") + public ReturnT maintenanceCancelReservation(String params) { + //维护配送的状态 + String method = "######################DistributionDatarepair.maintenanceDeliveryStatus"; + log.info(method+"维护配送订单id:{}",params); + distributionReservationClient.maintenanceCancelReservation(params); + log.info(method+"维护配送订单结束"); + return ReturnT.SUCCESS; + } + + From 1b9ec1750cb41e515f74e5a4c7872a717712e990 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Sat, 23 Mar 2024 13:18:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(service):=20=E4=BF=AE=E6=94=B9=E8=BD=AC?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81=E5=90=8E=E5=9C=A8=E5=BA=93=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E4=B8=8D=E5=87=86=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改转库存品后在库数量不准确的问题 --- .../service/impl/DistributionParcelListServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 de462c1e8..a3a69f0e1 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 @@ -811,7 +811,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl packageIds, Integer qu) { BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); if (Func.isEmpty(myCurrentWarehouse)) {