From 2e41513f2994c68c435c3b3e135411bfdcbdb478 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Thu, 16 Nov 2023 16:56:20 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=95=86=E5=9C=BA=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E6=9F=A5=E8=AF=A2=E9=A2=84=E7=BA=A6=E5=8D=95--?= =?UTF-8?q?=E5=BE=85=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/feign/IBasicdataClientClient.java | 3 ++- .../basicdata/feign/BasicdataClientClient.java | 3 ++- .../mapper/BasicdataClientUserMapper.java | 2 +- .../mapper/BasicdataClientUserMapper.xml | 16 ++-------------- .../service/IBasicdataClientUserService.java | 2 +- .../impl/BasicdataClientUserServiceImpl.java | 6 ++++-- .../mapper/DistributionParcelListMapper.xml | 4 ++++ .../impl/DistributionStockListServiceImpl.java | 5 +++-- 8 files changed, 19 insertions(+), 22 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java index 4931fc4bc..2096d43a9 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java @@ -17,6 +17,7 @@ package com.logpm.basicdata.feign; import com.logpm.basicdata.entity.BasicdataClientEntity; +import com.logpm.basicdata.entity.BasicdataClientUserEntity; import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; @@ -65,6 +66,6 @@ public interface IBasicdataClientClient { * @return */ @GetMapping(BASICDATACLIENTUSERENTITYLISTBYUSERID) - List getBasicdataClientUserEntityListByUserId(@RequestParam("userId") Long userId); + List getBasicdataClientUserEntityListByUserId(@RequestParam("userId") Long userId); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java index 27df74000..cd7eb3c2e 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.basicdata.entity.BasicdataClientEntity; +import com.logpm.basicdata.entity.BasicdataClientUserEntity; import com.logpm.basicdata.service.IBasicdataClientService; import com.logpm.basicdata.service.IBasicdataClientUserService; import lombok.AllArgsConstructor; @@ -80,7 +81,7 @@ public class BasicdataClientClient implements IBasicdataClientClient { } @Override - public List getBasicdataClientUserEntityListByUserId(Long userId) { + public List getBasicdataClientUserEntityListByUserId(Long userId) { return basicdataClientUserService.getBasicdataClientUserEntityListByUserId(userId); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientUserMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientUserMapper.java index c04f65652..a7ef20ef8 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientUserMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientUserMapper.java @@ -34,7 +34,7 @@ import java.util.List; public interface BasicdataClientUserMapper extends BaseMapper { - List getBasicdataClientUserEntityListByUserId(@Param("userId") Long userId); + List getBasicdataClientUserEntityListByUserId(@Param("userId") Long userId); List selectBasicdataClientAccountPage(IPage page, BasicdataClientAccountVO basicdataClientAccountVO); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientUserMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientUserMapper.xml index e360a386b..fad0187a1 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientUserMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientUserMapper.xml @@ -3,20 +3,8 @@ - - - - - - - - - - - - - - SELECT lbc1.* FROM diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientUserService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientUserService.java index 5cbb31569..668a66a24 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientUserService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientUserService.java @@ -15,7 +15,7 @@ public interface IBasicdataClientUserService extends BaseService getBasicdataClientUserEntityListByUserId(Long userId); + List getBasicdataClientUserEntityListByUserId(Long userId); /** * 查询当前客户下面的账号列表 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientUserServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientUserServiceImpl.java index 0cc4e0a16..7f3c82994 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientUserServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientUserServiceImpl.java @@ -45,8 +45,10 @@ public class BasicdataClientUserServiceImpl extends BaseServiceImpl getBasicdataClientUserEntityListByUserId(Long userId) { - return baseMapper.getBasicdataClientUserEntityListByUserId(userId); + public List getBasicdataClientUserEntityListByUserId(Long userId) { + List basicdataClientUserEntityListByUserId = baseMapper.getBasicdataClientUserEntityListByUserId(userId); + log.info(">.......>>>>>>>>>>>>> {}",basicdataClientUserEntityListByUserId); + return basicdataClientUserEntityListByUserId; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index f0bdd4281..afe143666 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -192,6 +192,10 @@ and lwtg.position_code = #{param.goodsAllocation} + + and ldpl.conditions = #{param.conditions} + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java index 864358e23..37d700a1b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java @@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.basic.entity.BasicMaterialEntity; import com.logpm.basic.feign.IBasicMaterialClient; import com.logpm.basicdata.entity.BasicdataClientEntity; +import com.logpm.basicdata.entity.BasicdataClientUserEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataClientClient; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; @@ -366,10 +367,10 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl basicdataClientUserEntityListByUserIds = basicdataClientClient.getBasicdataClientUserEntityListByUserId(AuthUtil.getUserId()); + List basicdataClientUserEntityListByUserIds = basicdataClientClient.getBasicdataClientUserEntityListByUserId(AuthUtil.getUserId()); List clientIds =null; if(Func.isNotEmpty(basicdataClientUserEntityListByUserIds)){ - clientIds = basicdataClientUserEntityListByUserIds.stream().map(BaseEntity::getId).collect(Collectors.toList()); + clientIds = basicdataClientUserEntityListByUserIds.stream().map(BasicdataClientUserEntity::getClientId).collect(Collectors.toList()); } IPage page1= baseMapper.pageClinet(page,distributionStockListEntity,clientIds); return page1;