From 110a251e7bb63bec1f5e83eeba250235faaa67f1 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Thu, 22 Aug 2024 15:06:16 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E5=8C=85?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tributionSplitOrderAllTaskServiceImpl.java | 5 +---- ...stributionSplitOrderDetailServiceImpl.java | 2 +- .../DistributionSplitOrderLogServiceImpl.java | 3 +-- ...DistributionSplitOrderTaskServiceImpl.java | 19 ++++++++++++++----- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderAllTaskServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderAllTaskServiceImpl.java index 438b699e9..a9fcc80f3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderAllTaskServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderAllTaskServiceImpl.java @@ -1,13 +1,10 @@ package com.logpm.distribution.service.impl; import com.logpm.distribution.entity.DistributionSplitOrderAllTaskEntity; -import com.logpm.distribution.entity.DistributionSplitOrderDetailEntity; import com.logpm.distribution.mapper.DistributionSplitOrderAllTaskMapper; -import com.logpm.distribution.mapper.DistributionSplitOrderDetailMapper; import com.logpm.distribution.service.IDistributionSplitOrderAllTaskService; -import com.logpm.distribution.service.IDistributionSplitOrderDetailService; -import groovy.util.logging.Slf4j; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderDetailServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderDetailServiceImpl.java index 194aeb82c..256bca917 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderDetailServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderDetailServiceImpl.java @@ -3,8 +3,8 @@ package com.logpm.distribution.service.impl; import com.logpm.distribution.entity.DistributionSplitOrderDetailEntity; import com.logpm.distribution.mapper.DistributionSplitOrderDetailMapper; import com.logpm.distribution.service.IDistributionSplitOrderDetailService; -import groovy.util.logging.Slf4j; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderLogServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderLogServiceImpl.java index 9c276afa8..2f9d8bb6a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderLogServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderLogServiceImpl.java @@ -1,11 +1,10 @@ package com.logpm.distribution.service.impl; import com.logpm.distribution.entity.DistributionSplitOrderLogEntity; -import com.logpm.distribution.entity.DistributionSplitOrderTaskEntity; import com.logpm.distribution.mapper.DistributionSplitOrderLogMapper; import com.logpm.distribution.service.IDistributionSplitOrderLogService; -import groovy.util.logging.Slf4j; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; 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 f81956a70..a1ba712a4 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 @@ -6,17 +6,26 @@ 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.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.distribution.dto.splitOrder.DistributionSplitAllTaskSearchDTO; import com.logpm.distribution.dto.splitOrder.DistributionSplitTaskSearchDTO; -import com.logpm.distribution.entity.*; +import com.logpm.distribution.entity.DistributionParcelListEntity; +import com.logpm.distribution.entity.DistributionSplitOrderAllTaskEntity; +import com.logpm.distribution.entity.DistributionSplitOrderDetailEntity; +import com.logpm.distribution.entity.DistributionSplitOrderLogEntity; +import com.logpm.distribution.entity.DistributionSplitOrderTaskEntity; +import com.logpm.distribution.entity.DistributionStockArticleEntity; import com.logpm.distribution.mapper.DistributionSplitOrderTaskMapper; -import com.logpm.distribution.service.*; +import com.logpm.distribution.service.IDistributionParcelListService; +import com.logpm.distribution.service.IDistributionSplitOrderAllTaskService; +import com.logpm.distribution.service.IDistributionSplitOrderDetailService; +import com.logpm.distribution.service.IDistributionSplitOrderLogService; +import com.logpm.distribution.service.IDistributionSplitOrderTaskService; +import com.logpm.distribution.service.IDistributionStockArticleService; import com.logpm.distribution.vo.SplitPackageOrderVO; -import groovy.util.logging.Slf4j; import lombok.AllArgsConstructor; -import org.springblade.common.constant.order.OrderSplitStateConstant; +import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.order.OrderSplitAllTaskStateConstant; +import org.springblade.common.constant.order.OrderSplitStateConstant; import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant; import org.springblade.common.constant.orderpackage.OrderPackageSplitStateConstant; import org.springblade.common.exception.CustomerException;