From 28f5169d6f0c2ea1d21bbfe1ed1a778ff6db7af3 Mon Sep 17 00:00:00 2001 From: kilo Date: Mon, 28 Aug 2023 09:22:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E9=85=8D=E8=AE=A2=E5=8D=95=E5=88=86?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/vo/BasicdataWarehouseVO.java | 8 +++ .../BasicdataGoodsAreaController.java | 4 +- .../service/IBasicdataGoodsAreaService.java | 2 +- .../impl/BasicdataGoodsAreaServiceImpl.java | 37 +++++++++---- .../DistributionDeliveryListController.java | 4 +- .../DistributionReservationController.java | 10 +++- .../IDistributionDeliveryListService.java | 2 +- .../IDistributionReservationService.java | 2 +- .../DistributionDeliveryListServiceImpl.java | 13 +++-- .../DistributionReservationServiceImpl.java | 55 +++++++++++++++++-- .../DistributionParcelListWrapper.java | 16 +++++- 11 files changed, 119 insertions(+), 34 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataWarehouseVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataWarehouseVO.java index 004a356f6..5de6f2289 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataWarehouseVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataWarehouseVO.java @@ -17,6 +17,7 @@ package com.logpm.basicdata.vo; import com.baomidou.mybatisplus.annotation.TableField; +import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -36,5 +37,12 @@ public class BasicdataWarehouseVO extends BasicdataWarehouseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "仓库货区") + private List children; + + + + + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java index 5827e65bf..eee07f906 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java @@ -90,8 +90,8 @@ public class BasicdataGoodsAreaController extends BladeController { * 货区 获取货区 */ @GetMapping("/getNode") - public R> getNode() { - List pages = basicdataGoodsAreaService.getNode(); + public R> getNode() { + List pages = basicdataGoodsAreaService.getNode(); log.info("pages>>>>>>>>>>>>>>{}",pages); return R.data(pages); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java index 6fed3bfdd..f8652fc3b 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java @@ -90,5 +90,5 @@ public interface IBasicdataGoodsAreaService extends BaseService getNode(); + List getNode(); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java index 5d35355c0..30d008e18 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java @@ -17,7 +17,9 @@ package com.logpm.basicdata.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity; import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity; @@ -27,13 +29,18 @@ import com.logpm.basicdata.mapper.BasicdataGoodsAllocationMapper; import com.logpm.basicdata.mapper.BasicdataGoodsAreaMapper; import com.logpm.basicdata.mapper.BasicdataGoodsShelfMapper; import com.logpm.basicdata.service.IBasicdataGoodsAreaService; +import com.logpm.basicdata.service.IBasicdataWarehouseService; import com.logpm.basicdata.vo.BasicdataGoodsAreaVO; import com.logpm.basicdata.vo.BasicdataNodeVO; import com.logpm.basicdata.vo.BasicdataWarehouseVO; +import com.logpm.basicdata.wrapper.WarehouseGoodsAreaWrapper; import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient; import lombok.AllArgsConstructor; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -63,9 +70,11 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl selectWarehouseGoodsAreaPage(IPage page, BasicdataGoodsAreaVO basicdataGoodsAreaVO) { return page.setRecords(baseMapper.selectWarehouseGoodsAreaPage(page, basicdataGoodsAreaVO)); @@ -154,15 +163,23 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl getNode() { - //查询一级仓库节点信息 - List basicdataWarehouseVOList = baseMapper.selectFirstNode(); - //获取二节点的货区 - for (BasicdataNodeVO basicdataNodeVO : basicdataWarehouseVOList) { - List goodeAreaNodes = goodsAllocationMapper.selectSecondNode(basicdataNodeVO.getValue()); - basicdataNodeVO.setChildren(goodeAreaNodes); - } - return basicdataWarehouseVOList; + public List getNode() { + //查询当前登陆用户能够操作的仓库列表 +// BladeUser user = AuthUtil.getUser(); + List myWarehouseList = basicdataWarehouseService.getMyWarehouseList(); + myWarehouseList.forEach(w->{ + LambdaQueryWrapper qw = Wrappers.query().lambda().eq(BasicdataGoodsAreaEntity::getWarehouseId, w.getId()); + List basicdataGoodsAreaEntities = basicdataGoodsAreaMapper.selectList(qw); + w.setChildren(basicdataGoodsAreaEntities); + }); +// //查询一级仓库节点信息 +// List basicdataWarehouseVOList = baseMapper.selectFirstNode(); +// //获取二节点的货区 +// for (BasicdataNodeVO basicdataNodeVO : basicdataWarehouseVOList) { +// List goodeAreaNodes = goodsAllocationMapper.selectSecondNode(basicdataNodeVO.getValue()); +// basicdataNodeVO.setChildren(goodeAreaNodes); +// } + return myWarehouseList; } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index 37aa8c62d..0c650d22f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -326,9 +326,9 @@ public class DistributionDeliveryListController extends BladeController { @GetMapping("/selectDiscussStockArticleInfoList") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "customArgs") - public R selectDiscussStockArticleInfoList(@ApiIgnore @RequestParam Map params, Query query) { + public R> selectDiscussStockArticleInfoList(@ApiIgnore @RequestParam Map params, Query query) { - List distributionStockArticle = distributionDeliveryListService.selectDiscussStockArticleInfoList(params,query); + IPage distributionStockArticle = distributionDeliveryListService.selectDiscussStockArticleInfoList(params,query); return R.data(distributionStockArticle); } /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java index 5c87da2a8..76b6c50c3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java @@ -310,8 +310,12 @@ public class DistributionReservationController extends BladeController { @GetMapping("/selectUpdateAvailableStockArticle") @ApiOperationSupport(order = 1) @ApiOperation(value = "详情", notes = "传入distrbutionReservation") - public R selectUpdateAvailableStockArticle(@RequestParam Long id) { - List stockArticleVOS = reservationService.selectUpdateAvailableStockArticle(id); - return R.data(stockArticleVOS); + public R> selectUpdateAvailableStockArticle(@ApiIgnore @RequestParam Long id, Query query,@ApiIgnore @RequestParam Map distributionStockArticle) { + IPage page = Condition.getPage(query); + + List stockArticleVOS = reservationService.selectUpdateAvailableStockArticle(id,distributionStockArticle); + page.setRecords(stockArticleVOS); + page.setTotal(stockArticleVOS.size()); + return R.data(page); } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java index 8dfe1bd49..3a6e55d2c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java @@ -197,5 +197,5 @@ public interface IDistributionDeliveryListService extends BaseService selectDiscussStockArticleInfoList(Map params, Query query); + IPage selectDiscussStockArticleInfoList(Map params, Query query); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java index fed7bd0d2..882bc3ebc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java @@ -173,7 +173,7 @@ public interface IDistributionReservationService extends BaseService selectUpdateAvailableStockArticle(Long reservationId); + List selectUpdateAvailableStockArticle(Long reservationId,Map distributionStockArticle); /** * 文员自主添加预约 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 5a6450229..5f904e695 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -1942,8 +1942,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl selectDiscussStockArticleInfoList(Map params, Query query) { - + public IPage selectDiscussStockArticleInfoList(Map params, Query query) { + IPage page = Condition.getPage(query); //这里还需要查询出该配送任务下的订单信息，在进行编辑的时候进行回显 String deliveryId = (String) params.get("deliveryId"); List stockArticleEntityList = baseMapper.selectDiscussStockArticleList(deliveryId); @@ -1970,13 +1970,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl pages = distributionStockArticleService.page(Condition.getPage(query), lambdaQueryWrapper); IPage distributionStockArticleVOIPage = DistributionStockArticleWrapper.build().pageVO(pages); - List records = distributionStockArticleVOIPage.getRecords(); - records.forEach(r->{ +// List records = distributionStockArticleVOIPage.getRecords(); + distributionStockArticleVOIPage.getRecords().forEach(r->{ //查询包件情况 List parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(Wrappers.query().lambda().eq(DistributionParcelListEntity::getStockArticleId, r.getId())); r.setParcelListVOS(DistributionParcelListWrapper.build().listVO(parcelListEntityList)); }); - records.addAll(stockArticleVOList); - return records; +// records.addAll(stockArticleVOList); + + return distributionStockArticleVOIPage; } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index a347f5d52..d946a8a35 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -679,8 +679,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImplquery().lambda().eq(DistributionReservationStocklistEntity::getReservationId, reservationEntity.getId())); //预约订单数量 - orderNum.getAndAdd(reservationEntity.getStockArticleId().split(",").length); + orderNum.getAndAdd(Integer.parseInt(count.toString())); //统计包件数量 packageNum.getAndAdd(reservationEntity.getReservationNum()); //TODO 设置是否齐套 @@ -692,7 +694,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl reservationStockarticleEntityList = distributionReservationStockarticleService.getBaseMapper().selectList(q); List reservationStocklistEntityList = distributionReservationStocklistService.getBaseMapper().selectList(w); - //查询预约单下的包件信息 if (!Func.isEmpty(reservationStockarticleEntityList)) { @@ -1396,16 +1397,41 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl selectUpdateAvailableStockArticle(Long reservationId) { - + public List selectUpdateAvailableStockArticle(Long reservationId,Map distributionStockArticle) { //这里还需要查询出该预约单下的订单信息 //这里将该预约下的订单进行过滤 + String orderCode = (String) distributionStockArticle.get("orderCode"); + String mallName = (String) distributionStockArticle.get("mallName"); + String descriptionGoods = (String) distributionStockArticle.get("descriptionGoods"); + String brand = (String) distributionStockArticle.get("brand"); + String customerName = (String) distributionStockArticle.get("customerName"); + String customerTelephone = (String) distributionStockArticle.get("customerTelephone"); List reservationStockarticleEntityList = distributionReservationStockarticleService.getBaseMapper().selectList(Wrappers.query().lambda().eq(DistributionReservationStockarticleEntity::getReservationId, reservationId)); List stockArticleVOArrayList = new ArrayList<>(); List list = new ArrayList<>(); reservationStockarticleEntityList.forEach(r -> { list.add(r.getStockArticleId().toString()); - List stockArticleEntities = distributionStockArticleService.getBaseMapper().selectList(Wrappers.query().lambda().eq(DistributionStockArticleEntity::getId, r.getStockArticleId())); + LambdaQueryWrapper lambda = Wrappers.query().lambda(); + if (Func.isNotEmpty(orderCode)){ + lambda.like(DistributionStockArticleEntity::getOrderCode,orderCode); + } + if (Func.isNotEmpty(mallName)){ + lambda.like(DistributionStockArticleEntity::getOrderCode,mallName); + } + if (Func.isNotEmpty(descriptionGoods)){ + lambda.like(DistributionStockArticleEntity::getOrderCode,descriptionGoods); + } + if (Func.isNotEmpty(brand)){ + lambda.like(DistributionStockArticleEntity::getOrderCode,brand); + } + if (Func.isNotEmpty(customerName)){ + lambda.like(DistributionStockArticleEntity::getOrderCode,customerName); + } + if (Func.isNotEmpty(customerTelephone)){ + lambda.like(DistributionStockArticleEntity::getOrderCode,customerTelephone); + } + lambda.eq(DistributionStockArticleEntity::getId,r.getStockArticleId()); + List stockArticleEntities = distributionStockArticleService.getBaseMapper().selectList(lambda); List stockArticleVOList = DistributionStockArticleWrapper.build().listVO(stockArticleEntities); stockArticleVOList.forEach(s -> { List parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(Wrappers.query().lambda().eq(DistributionParcelListEntity::getStockArticleId, s.getId())); @@ -1429,6 +1455,24 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl stockArticleEntityList = distributionStockArticleService.getBaseMapper().selectList(qw); List stockArticleVOS = DistributionStockArticleWrapper.build().listVO(stockArticleEntityList); stockArticleVOS.forEach(s -> { @@ -1441,6 +1485,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl { + + @Autowired private IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient; + public static DistributionParcelListWrapper build(){ return new DistributionParcelListWrapper(); } @@ -36,9 +44,11 @@ public class DistributionParcelListWrapper extends BaseEntityWrapper