From 43388c3c74c2778715c6a04abe4c0f107889c226 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Thu, 3 Apr 2025 15:23:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(all):=20=E5=BC=82=E5=B8=B8=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改广播消息 --- .../springblade/common/constant/broadcast/FanoutConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java b/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java index f3c21af39..dadf2e5ca 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java @@ -424,7 +424,7 @@ public abstract class FanoutConstants { /** * 异常审核 - * @see org.springblade.common.model.ReservationVO + * @see org.springblade.common.model.AbnormalPackageVO */ interface DeliveryAbnormalReview { From 3653c6f01a6de20f4f482c0998df3dbe0b1b201f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E9=BE=99?= Date: Thu, 3 Apr 2025 15:34:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E5=8D=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionSplitOrderTaskServiceImpl.java | 7 +++++++ .../distribution/vo/DistributionSplitOrderTaskVO.java | 1 + 2 files changed, 8 insertions(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java index 24cb21dcd..1a6587a8d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java @@ -90,11 +90,16 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpl listVo = new ArrayList<>(); if (list != null && !list.isEmpty()) { Map userIdNameMap = getUserIdNameMap(list.stream().map(DistributionSplitOrderTaskEntity::getCreateUser).collect(Collectors.toList())); + List allTaskInfo = list.stream().map(DistributionSplitOrderTaskEntity::getSplitOrderAllTaskId).collect(Collectors.toList()); + + List allTaskList = distributionSplitOrderAllTaskService.listByIds(allTaskInfo); + Map allTaskListById = allTaskList.stream().collect(Collectors.toMap(DistributionSplitOrderAllTaskEntity::getId, u -> u)); listVo = list.stream().map(item -> { DistributionSplitOrderTaskVO distributionSplitOrderTaskVO = new DistributionSplitOrderTaskVO(); BeanUtil.copyProperties(item, distributionSplitOrderTaskVO); distributionSplitOrderTaskVO.setCreateUserName(userIdNameMap.get(item.getCreateUser())); + distributionSplitOrderTaskVO.setAllTaskStatus(allTaskListById.get(item.getSplitOrderAllTaskId()).getState()); return distributionSplitOrderTaskVO; }).collect(Collectors.toList()); } @@ -917,6 +922,8 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpl list = distributionSplitOrderAllTaskService.list(page, queryWrapper); List listVo = new ArrayList<>(); if (list != null && !list.isEmpty()) { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/vo/DistributionSplitOrderTaskVO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/vo/DistributionSplitOrderTaskVO.java index 35eb05339..22eb4b836 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/vo/DistributionSplitOrderTaskVO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/vo/DistributionSplitOrderTaskVO.java @@ -8,4 +8,5 @@ import lombok.EqualsAndHashCode; @Data public class DistributionSplitOrderTaskVO extends DistributionSplitOrderTaskEntity { private String createUserName; + private Integer allTaskStatus; } From f227c4074e5f3841a45e25b0379fae32448824bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E9=BE=99?= Date: Thu, 3 Apr 2025 16:02:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E5=8D=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionSplitOrderTaskServiceImpl.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java index 1a6587a8d..0e493a32a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.SerializationUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; +import com.logpm.basicdata.feign.IBasicdataCategoryClient; +import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.distribution.bean.Resp; import com.logpm.distribution.dto.splitOrder.DistributionSplitAllTaskSearchDTO; import com.logpm.distribution.dto.splitOrder.DistributionSplitTaskSearchDTO; @@ -26,6 +28,7 @@ import com.logpm.distribution.service.IDistributionStockArticleService; import com.logpm.distribution.vo.DistributionSplitOrderAllTaskVO; import com.logpm.distribution.vo.DistributionSplitOrderTaskVO; import com.logpm.distribution.vo.SplitPackageOrderVO; +import com.logpm.oldproject.feign.IWarehouseClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.order.*; @@ -40,6 +43,7 @@ import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.system.entity.User; import org.springblade.system.feign.IUserClient; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -60,6 +64,7 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpl packageList = distributionParcelListService.list( Wrappers.lambdaQuery() .in(DistributionParcelListEntity::getOrderPackageCode, packageCodes) .eq(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiruku.getValue()) @@ -278,8 +283,11 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpllambdaQuery()