From b65a8e7a4519271f5023c29a4805d529a05127c7 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 25 Mar 2024 19:47:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E9=85=8D=E8=AE=A2=E5=8D=95=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E6=B1=A0=E5=A2=9E=E5=8A=A0=E5=8C=85=E4=BB=B6=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/IDistributionDeliveryListClient.java | 7 +++++++ .../feign/DistributionDeliveryListClient.java | 16 ++++++++++++++++ .../mapper/DistributionStockArticleMapper.xml | 10 ++++++++++ .../patch/jobhandle/DistributionDatarepair.java | 16 ++++++++++++++++ 4 files changed, 49 insertions(+) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java index 0968fd66b..fd5d8e912 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryListClient.java @@ -120,6 +120,13 @@ public interface IDistributionDeliveryListClient { @GetMapping(TOP+"/maintenanceDeliveryInfo") void maintenanceDeliveryInfo(@RequestParam("deliveryId")String deliveryId); + /** + * 维护指定仓库配送车次任务信息 + * @param params + * @return + */ + @GetMapping(TOP+"/maintenanceDeliveryInfoByWarehouseId") + void maintenanceDeliveryInfoByWarehouseId(@RequestParam("warehouseId")String params); // /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java index 52cf2358b..5ba924b2a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryListClient.java @@ -17,6 +17,7 @@ package com.logpm.distribution.feign; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO; import com.logpm.distribution.entity.DistributionDeliveryListEntity; import com.logpm.distribution.service.IDistributionDeliveryListService; @@ -27,11 +28,13 @@ import lombok.AllArgsConstructor; import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; import java.util.List; +import java.util.stream.Collectors; /** * 配送管理 Feign实现类 @@ -98,5 +101,18 @@ public class DistributionDeliveryListClient implements IDistributionDeliveryList distributionDeliveryListService.maintenanceDeliveryInfoAndDeliveryStatus(deliveryIds); } + /** + * @param params + */ + @Override + public void maintenanceDeliveryInfoByWarehouseId(String params) { + List entityList = distributionDeliveryListService.list(Wrappers.query().lambda().in(DistributionDeliveryListEntity::getWarehouseId, Func.toLongList(params))); + if (Func.isNotEmpty(entityList)){ + String deliveryIds = entityList.stream().map(DistributionDeliveryListEntity::getId).map(String::valueOf).collect(Collectors.joining(",")); + distributionDeliveryListService.maintenanceDeliveryInfoAndDeliveryStatus(deliveryIds); + } + + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 84721f731..b56bf8f37 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -609,9 +609,19 @@ LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id + LEFT JOIN + (SELECT ldsaa.id,SUM(ldpll.quantity) AS num + FROM logpm_distribution_stock_article ldsaa + LEFT JOIN logpm_distribution_parcel_list ldpll ON ldsaa.id = ldpll.stock_article_id + WHERE ldpll.order_package_loading_status != '20' + AND ldpll.order_package_reservation_status !='20' + AND ldpll.order_package_status != '70' + GROUP BY ldsaa.id) + AS t ON t.id = ldsa.id ldsa.order_status in ('10','20','30','70') and ldsa.reservation_status in ('10','20') + and t.num > 0 AND ldsa.hand_quantity > 0 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 b111d3935..5ee0d242c 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 @@ -140,6 +140,22 @@ public class DistributionDatarepair { + /** + * 维护指定取消预约信息 + * @return + */ + @XxlJob("maintenanceDeliveryInfo") + public ReturnT maintenanceDeliveryInfo(String params) { + //维护配送的状态 + String method = "######################DistributionDatarepair.maintenanceDeliveryStatus"; + log.info(method+"维护配送订单id:{}",params); + deliveryListClient.maintenanceDeliveryInfoByWarehouseId(params); + log.info(method+"维护配送订单结束"); + return ReturnT.SUCCESS; + } + + +