From 7c38a3a5fd0b28c8dd1d02cc796229c0e32e65a6 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Fri, 4 Aug 2023 19:50:47 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=202.=E5=A2=9E=E5=8A=A0=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=BA=93=E5=AD=98=E5=93=81=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/IBasicdataClientClient.java | 12 ++ .../feign/BasicdataClientClient.java | 10 ++ .../mapper/BasicdataClientUserMapper.java | 3 + .../mapper/BasicdataClientUserMapper.xml | 20 +++ .../service/IBasicdataClientUserService.java | 10 ++ .../impl/BasicdataClientUserServiceImpl.java | 8 ++ .../DistributionStockListController.java | 6 +- .../mapper/DistributionStockArticleMapper.xml | 20 ++- .../mapper/DistributionStockListMapper.java | 3 + .../mapper/DistributionStockListMapper.xml | 121 ++++++++++++++---- .../IDistributionStockListService.java | 2 + .../DistributionStockArticleServiceImpl.java | 4 +- .../DistributionStockListServiceImpl.java | 23 +++- .../factory/receiver/UnloadCarComHandler.java | 86 +++++++------ 14 files changed, 257 insertions(+), 71 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 eceb6bc6a..4931fc4bc 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 @@ -23,6 +23,8 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * 基础客户表 Feign接口类 * @@ -37,6 +39,7 @@ public interface IBasicdataClientClient { String API_PREFIX = "/client"; String TOP = API_PREFIX + "/top2"; String GETCUSTOMER = API_PREFIX + "/customer"; + String BASICDATACLIENTUSERENTITYLISTBYUSERID = API_PREFIX + "/BasicdataClientUserEntityListByUserId"; /** * 获取基础客户表列表 @@ -55,4 +58,13 @@ public interface IBasicdataClientClient { @GetMapping(GETCUSTOMER) BasicdataClientEntity getCustomer(@RequestParam("customerName") String customerName,@RequestParam("customerCode") String customerCode); + + /** + * 根据用户ID 获取用户绑定的客户 + * @param userId + * @return + */ + @GetMapping(BASICDATACLIENTUSERENTITYLISTBYUSERID) + 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 9373cab4e..e3675dd41 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 @@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.service.IBasicdataClientUserService; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; @@ -30,6 +31,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; +import java.util.List; + /** * 基础客户表 Feign实现类 * @@ -43,6 +46,8 @@ public class BasicdataClientClient implements IBasicdataClientClient { private final IBasicdataClientService basicdataClientService; + private final IBasicdataClientUserService basicdataClientUserService; + @Override @GetMapping(TOP) public BladePage top(Integer current, Integer size) { @@ -74,4 +79,9 @@ public class BasicdataClientClient implements IBasicdataClientClient { ); } + @Override + 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 cbce05707..c5dd942c2 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 @@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.basicdata.entity.BasicdataCarrierEntity; +import com.logpm.basicdata.entity.BasicdataClientEntity; import com.logpm.basicdata.entity.BasicdataClientUserEntity; import com.logpm.basicdata.excel.BasicdataCarrierExcel; import com.logpm.basicdata.vo.BasicdataCarrierVO; @@ -36,4 +37,6 @@ import java.util.List; public interface BasicdataClientUserMapper extends BaseMapper { + List getBasicdataClientUserEntityListByUserId(@Param("userId") Long userId); + } 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 2649b628e..1f2d0c8c2 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,8 +3,28 @@ + + + + + + + + + + + + + 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 5cac4cfa4..c718aa2f4 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 @@ -1,7 +1,17 @@ package com.logpm.basicdata.service; +import com.logpm.basicdata.entity.BasicdataClientEntity; import com.logpm.basicdata.entity.BasicdataClientUserEntity; import org.springblade.core.mp.base.BaseService; +import java.util.List; + public interface IBasicdataClientUserService extends BaseService { + + + /** + * 根据当前登录人获取绑定客户ID集合 + * @return + */ + 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 a242bd209..020bc03c1 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 @@ -1,5 +1,6 @@ package com.logpm.basicdata.service.impl; +import com.logpm.basicdata.entity.BasicdataClientEntity; import com.logpm.basicdata.entity.BasicdataClientUserEntity; import com.logpm.basicdata.mapper.BasicdataClientUserMapper; import com.logpm.basicdata.service.IBasicdataClientUserService; @@ -8,8 +9,15 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; + @Slf4j @Service @AllArgsConstructor public class BasicdataClientUserServiceImpl extends BaseServiceImpl implements IBasicdataClientUserService { + @Override + public List getBasicdataClientUserEntityListByUserId(Long userId) { + return baseMapper.getBasicdataClientUserEntityListByUserId(userId); + + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java index 3c94a79b5..feff3b492 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java @@ -97,11 +97,11 @@ public class DistributionStockListController extends BladeController { /** * 库存品管理 商城客户查询列表 */ - @GetMapping("/listclinet") + @GetMapping("/listClient") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入distributionStockList") - public R> listClinet(@ApiIgnore @RequestParam Map distributionStockList, Query query) { - IPage pages = distributionStockListService.pageOwn(Condition.getPage(query), distributionStockList); + public R> listClient(@ApiIgnore @RequestParam Map distributionStockList, Query query) { + IPage pages = distributionStockListService.pageClient(Condition.getPage(query), distributionStockList); return R.data(pages); } 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 6b1ba75ef..ad404f831 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 @@ -80,10 +80,28 @@ SELECT client_id from logpm_basicdata_clientuser where user_id =#{loginUserId} ) and - ldsa.is_deleted = 0 and ldsa.type_service ='2' + ldsa.is_deleted = 0 and ldsa.type_service ='2' and ldsa.genre = 1 and ldsa.order_code == #{distributionStockArticleVO.orderCode} + + and ldsa.stockup_status = #{distributionStockArticleVO.stockupStatus} + + + and ldsa.reservation_status = #{distributionStockArticleVO.reservationStatus} + + + and ldsa.order_status = #{distributionStockArticleVO.orderStatus} + + + and ldsa.grounding_status = #{distributionStockArticleVO.groundingStatus} + + + and ldsa.freeze_status = #{distributionStockArticleVO.freezeStatus} + + + + - select * from logpm_distribution_stock_list where is_deleted = 0 - - - - - - + select * from logpm_distribution_stock_list where is_deleted = 0 + + + + + + + + - + update logpm_distribution_stock_list set quantity_stock = quantity_stock - #{num}, quantity_occupied = quantity_occupied - #{num}, diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java index f980c6713..52e6c1e00 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java @@ -94,4 +94,6 @@ public interface IDistributionStockListService extends BaseService selectStockListInfoList(Long reservationId, Long stockListId); Integer submitQuantityByStockListId(int num, Long stockListId); + + IPage pageClient(IPage page, Map distributionStockList); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index 9cd9ab9f4..85c40f023 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -323,7 +323,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl selectDistributionStockListPage(IPage page, DistributionStockListVO distributionStockList) { @@ -226,10 +234,23 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl pageOwn(IPage page, Map distributionStockList) { DistributionStockListEntity distributionStockListEntity = JSONObject.parseObject(JSONObject.toJSONString(distributionStockList), DistributionStockListEntity.class); IPage page1= baseMapper.pageOwn(page,distributionStockListEntity); - return page1; } + @Override + public IPage pageClient(IPage page, Map distributionStockList) { + DistributionStockListEntity distributionStockListEntity = JSONObject.parseObject(JSONObject.toJSONString(distributionStockList), DistributionStockListEntity.class); + + // 得到当前登录用户的Id + List basicdataClientUserEntityListByUserIds = basicdataClientClient.getBasicdataClientUserEntityListByUserId(AuthUtil.getUserId()); + List clientIds =null; + if(Func.isNotEmpty(basicdataClientUserEntityListByUserIds)){ + clientIds = basicdataClientUserEntityListByUserIds.stream().map(e -> e.getId()).collect(Collectors.toList()); + } + IPage page1= baseMapper.pageClinet(page,distributionStockListEntity,clientIds); + return page1; + } + @Override public DistributionStockupStockListInfoVO selectStockListInfo(Long reservationId, Long stockListId) { return baseMapper.selectStockListInfo(reservationId,stockListId); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java index d1bb865ce..48894a44b 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java @@ -1,6 +1,8 @@ package com.logpm.factory.receiver; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.fasterxml.jackson.core.JsonProcessingException; import com.logpm.factory.comfac.dto.UnloadCarDTO; import com.logpm.factory.mt.entity.MtFactoryOrderMain; @@ -18,6 +20,7 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.RabbitConstant; import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.ResultCode; +import org.springblade.core.tool.utils.StringUtil; import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.annotation.RabbitHandler; import org.springframework.amqp.rabbit.annotation.RabbitListener; @@ -75,7 +78,6 @@ public class UnloadCarComHandler { List carNumList = advanceDetailClient.getByCarNum(unloadCarDTO.getUnloadCarNum()); log.info("##################unloadCarComDataHandler carNumList：{}", carNumList); - /** * 安装品类进行分组 */ @@ -99,7 +101,6 @@ public class UnloadCarComHandler { // 对这个集合内进行分组 Map> stringListMap = allMtData.stream().collect(Collectors.groupingBy(MTOrderPackageRelationVO::getInvoiceOrderCode)); Set set = stringListMap.keySet(); - boolean isPush = false; String carNum = null; for (String s : set) { // 得到某个工厂运输批次的集合 @@ -109,61 +110,66 @@ public class UnloadCarComHandler { // 当前批次的包间 在 这个配载计划中存在一个 则进行通知 for (String mtStr : mtStrs) { if (strs.contains(mtStr)) { - isPush = true; carNum = s; break; } } - if (isPush) { - break; - } - } - - if (isPush) { try { - R r = mtFactoryDataService.sendUnloadCarNum(carNum, unloadCarDTO.getCompleteDate()); - log.info("##################{} 梦天确认签收数据推送1", carNum); - - if (r.getCode() == ResultCode.SUCCESS.getCode()) { - log.info("##################{} 梦天确认签收数据推送2", carNum); - - MtPushData mtPushData = new MtPushData(); - mtPushData.setPushTime(new Date()); - mtPushData.setPushStatus(1);// 推送状态 - mtPushData.setRefCode(carNum); - mtPushData.setRefType(1);// 订单主表 - - // todo 这里需要查询主推送单的 ID - List mtFactoryOrderMainList = mtFactoryOrderMainService.findMtFactoryOrderMainByInvoiceOrderCode(carNum); - if(mtFactoryOrderMainList.size()>0){ - mtFactoryOrderMainList.get(0); - mtPushData.setRefId(mtFactoryOrderMainList.get(0).getId()); - - } - - // 插入推送数据 - mtPushDataService.save(mtPushData); - - + if (StringUtil.isNoneBlank(carNum)) { + sendDataCarNum(carNum, unloadCarDTO.getCompleteDate()); } - } catch (ParseException e) { e.printStackTrace(); - } catch (JsonProcessingException e) { - e.printStackTrace(); } catch (NoSuchAlgorithmException e) { e.printStackTrace(); + } catch (JsonProcessingException e) { + e.printStackTrace(); } - - } else { - log.info("##################{} 车次 没有匹配需要推送的数据", unloadCarDTO.getUnloadCarNum()); - } } + /** + * 根基匹配到的发货单编号 推送梦天 + * + * @param carNum + * @param completeDate + * @throws ParseException + * @throws NoSuchAlgorithmException + * @throws JsonProcessingException + */ + private void sendDataCarNum(String carNum, String completeDate) throws ParseException, NoSuchAlgorithmException, JsonProcessingException { + + // 需要判断这个发货单编号是否推送过 + LambdaQueryChainWrapper lambdaQueryChainWrapper = new LambdaQueryChainWrapper(MtPushData.class); + lambdaQueryChainWrapper.eq(MtPushData::getRefCode, carNum); + MtPushData ms = mtPushDataService.getOne(lambdaQueryChainWrapper); + if (ObjectUtils.isNotNull(ms)) { + log.info("##################{} 车次已经推送过", carNum); + return; + } + R r = mtFactoryDataService.sendUnloadCarNum(carNum, completeDate); + log.info("##################{} 梦天确认签收数据推送1", carNum); + if (r.getCode() == ResultCode.SUCCESS.getCode()) { + log.info("##################{} 梦天确认签收数据推送2", carNum); + MtPushData mtPushData = new MtPushData(); + mtPushData.setPushTime(new Date()); + mtPushData.setPushStatus(1);// 推送状态 + mtPushData.setRefCode(carNum); + mtPushData.setRefType(1);// 订单主表 + // todo 这里需要查询主推送单的 ID + List mtFactoryOrderMainList = mtFactoryOrderMainService.findMtFactoryOrderMainByInvoiceOrderCode(carNum); + if (mtFactoryOrderMainList.size() > 0) { + mtFactoryOrderMainList.get(0); + mtPushData.setRefId(mtFactoryOrderMainList.get(0).getId()); + } + // 插入推送数据 + mtPushDataService.save(mtPushData); + } + } + }