|
|
@ -17,16 +17,10 @@ |
|
|
|
package com.logpm.distribution.service.impl; |
|
|
|
package com.logpm.distribution.service.impl; |
|
|
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; |
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; |
|
|
|
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; |
|
|
|
import com.logpm.basic.feign.IBasicTenantCodeClient; |
|
|
|
|
|
|
|
import com.logpm.basicdata.entity.BasicdataClientUserEntity; |
|
|
|
|
|
|
|
import com.logpm.basicdata.service.IBasicdataClientUserService; |
|
|
|
|
|
|
|
import com.logpm.basicdata.service.IBasicdataStorageServicesService; |
|
|
|
|
|
|
|
import com.logpm.distribution.dto.DistributionStockArticleDTO; |
|
|
|
import com.logpm.distribution.dto.DistributionStockArticleDTO; |
|
|
|
import com.logpm.distribution.entity.*; |
|
|
|
import com.logpm.distribution.entity.*; |
|
|
|
import com.logpm.distribution.excel.DistributionStockArticleExcel; |
|
|
|
import com.logpm.distribution.excel.DistributionStockArticleExcel; |
|
|
@ -37,7 +31,6 @@ import com.logpm.distribution.service.*; |
|
|
|
import com.logpm.distribution.vo.DistributionStockArticleVO; |
|
|
|
import com.logpm.distribution.vo.DistributionStockArticleVO; |
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.apache.poi.ss.formula.functions.T; |
|
|
|
|
|
|
|
import org.springblade.common.constant.DictBizConstant; |
|
|
|
import org.springblade.common.constant.DictBizConstant; |
|
|
|
import org.springblade.core.mp.base.BaseServiceImpl; |
|
|
|
import org.springblade.core.mp.base.BaseServiceImpl; |
|
|
|
import org.springblade.core.secure.BladeUser; |
|
|
|
import org.springblade.core.secure.BladeUser; |
|
|
@ -45,17 +38,14 @@ import org.springblade.core.secure.utils.AuthUtil; |
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
import org.springblade.core.tool.utils.Func; |
|
|
|
import org.springblade.core.tool.utils.Func; |
|
|
|
import org.springblade.system.cache.DictBizCache; |
|
|
|
import org.springblade.system.cache.DictBizCache; |
|
|
|
import org.springblade.system.entity.User; |
|
|
|
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
import wrapper.DistributionStockArticleWrapper; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.nio.charset.StandardCharsets; |
|
|
|
|
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.List; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
import java.util.Optional; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 配送在库订单 服务实现类 |
|
|
|
* 配送在库订单 服务实现类 |
|
|
@ -80,12 +70,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib |
|
|
|
|
|
|
|
|
|
|
|
private final IDistributionParcelListService distributionParcelListService; |
|
|
|
private final IDistributionParcelListService distributionParcelListService; |
|
|
|
|
|
|
|
|
|
|
|
private final IBasicTenantCodeClient basicTenantCodeClient; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private final IBasicdataStorageServicesService basicdataStorageServicesService; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private final IBasicdataClientUserService basicdataClientUserService; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public IPage<DistributionStockArticleVO> selectDistributionStockArticlePage(IPage<DistributionStockArticleVO> page, DistributionStockArticleVO distributionStockArticle) { |
|
|
|
public IPage<DistributionStockArticleVO> selectDistributionStockArticlePage(IPage<DistributionStockArticleVO> page, DistributionStockArticleVO distributionStockArticle) { |
|
|
|