From ff24a7adb71c5458ee87f3cbf2570ef26dee40ff Mon Sep 17 00:00:00 2001 From: kilo Date: Wed, 19 Jul 2023 19:01:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/DistributionReservationVO.java | 6 +- .../DistributionReservationController.java | 33 +++ .../mapper/DistributionReservationMapper.java | 4 + .../mapper/DistributionReservationMapper.xml | 76 ++++++ .../DistributionReservationPackageMapper.java | 16 ++ .../DistributionReservationPackageMapper.xml | 28 ++ .../IDistributionReservationService.java | 20 +- .../DistributionReservationServiceImpl.java | 245 ++++++++++-------- 8 files changed, 319 insertions(+), 109 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java index 28361ce9f..12dfae1a4 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionReservationVO.java @@ -42,14 +42,12 @@ public class DistributionReservationVO extends DistributionReservationEntity { * 库存品信息列表 */ @ApiModelProperty(value = "库存品信息列表") - private List inventoryList; + private List inventoryList; /** * 订单信息列表 */ @ApiModelProperty(value = "订单信息列表") - private List stockArticleList; - - + private List stockArticleList; } 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 19556b550..d1fd48d06 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 @@ -233,4 +233,37 @@ public class DistributionReservationController extends BladeController { boolean result = reservationService.cancelReservation(reservationDTO); return R.status(result); } + + /** + * 预约列表 详情 + */ + @GetMapping("/getReservationDetail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入distrbutionReservation") + public R getReservationDetail(@RequestParam String id) { + R reservationVO = reservationService.getReservationDetail(id); + return R.data(reservationVO); + } + + /** + * 预约列表 详情 + */ + @GetMapping("/getReservationPackage") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入distrbutionReservation") + public R getReservationPackage(@RequestParam String reservationId,@RequestParam String id) { + R reservationPackage = reservationService.getReservationPackage(reservationId,id); + return reservationPackage; + } + + /** + * 预约列表 详情 + */ + @GetMapping("/getReservationPackageList") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入distrbutionReservation") + public R getReservationPackageList(@RequestParam String reservationId) { + R reservationPackage = reservationService.getReservationPackageList(reservationId); + return reservationPackage; + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java index 757245b18..eb682f242 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java @@ -20,8 +20,10 @@ import com.logpm.distribution.entity.DistributionReservationEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.distribution.entity.DistributionStockArticleEntity; import com.logpm.distribution.excel.DistributionReservationExcel; import com.logpm.distribution.vo.DistributionReservationVO; +import com.logpm.distribution.vo.DistributionStockArticleVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -54,4 +56,6 @@ public interface DistributionReservationMapper extends BaseMapper toLongList); DistributionReservationVO getReservationDetail(String reservationId); + + List getStockArticleList(@Param("id") String reservationId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 30a2e4f21..27b1f984d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -80,5 +80,81 @@ AND reservation.reservation.id=#{reservationId} + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.java index 63069af53..4521f87e0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.java @@ -16,6 +16,8 @@ */ package com.logpm.distribution.mapper; +import com.logpm.distribution.dto.DistributionReservationPackageDTO; +import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.entity.DistributionReservationPackageEntity; import com.logpm.distribution.vo.DistributionReservationPackageVO; import com.logpm.distribution.excel.DistributionReservationPackageExcel; @@ -57,4 +59,18 @@ public interface DistributionReservationPackageMapper extends BaseMapper getReservationPackage(@Param("po")DistributionReservationPackageDTO reservationPackageDTO); + + /** + * 查询预约单的所有包件信息 + * @param reservationId + * @return + */ + List getReservationPackageList(@Param("id")String reservationId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml index 09b06d0e7..8b79b5327 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml @@ -36,5 +36,33 @@ + + 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 bf138df4f..73af11b41 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 @@ -66,7 +66,7 @@ public interface IDistributionReservationService extends BaseService getReservationDetail(String reservationId); /** * 新增预约列表数据 @@ -120,10 +120,24 @@ public interface IDistributionReservationService extends BaseService deliveryBusinessTask(DistributionDeliveryAllocationDTO allocationDTO); /** - * - * @param allocationDTO + *取消预约 + * @param reservationDTO * @return */ boolean cancelReservation(DistributionReservationDTO reservationDTO); + /** + * 查询预约下的包件信息 + * @param reservationId + * @param id + * @return + */ + R getReservationPackage(String reservationId, String id); + + /** + * 查询预约单下的所有包件信息 + * @param reservationId + * @return + */ + R getReservationPackageList(String reservationId); } 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 c7d4d4ccd..e1075bbb3 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 @@ -26,7 +26,10 @@ import com.logpm.distribution.mapper.DistributionReservationPackageMapper; import com.logpm.distribution.mapper.DistributionReservationStockarticleMapper; import com.logpm.distribution.mapper.DistributionReservationStocklistMapper; import com.logpm.distribution.service.*; +import com.logpm.distribution.vo.DistributionReservationStockarticleVO; import com.logpm.distribution.vo.DistributionReservationVO; +import com.logpm.distribution.vo.DistributionStockArticleVO; +import com.logpm.distribution.vo.DistributionStockListVO; import lombok.AllArgsConstructor; import org.springblade.common.serviceConstant.ServiceConstant; import org.springblade.core.mp.support.Condition; @@ -98,10 +101,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl selectDistrbutionReservationPage(IPage page, DistributionReservationVO distrbutionReservation) { return page.setRecords(baseMapper.selectDistrbutionReservationPage(page, distrbutionReservation)); @@ -138,9 +137,34 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl getReservationDetail(String reservationId) { + if (Func.isBlank(reservationId)) { + log.error("参数异常reservationId+{" + reservationId + "}"); + return R.fail("服务器正忙!!"); + } + //创建预约对象 + //2、查询预约单下的包件信息列表 + //3、查询预约单下的库存品信息列表 + DistributionReservationEntity reservationEntity = this.getById(reservationId); + DistributionReservationVO reservationVO = Func.copy(reservationEntity, DistributionReservationVO.class); + String reservationStatus = reservationVO.getReservationStatus(); + Integer typeService = reservationVO.getTypeService(); + switch (reservationStatus) { + case "2": + reservationVO.setReservationStatus("已确定"); + break; + case "1": + reservationVO.setReservationStatus("待确定"); + break; + } + + //1、查询预约单下的订单列表信息 + List stockArticleEntityList = distributionReservationMapper.getStockArticleList(reservationId); + if (stockArticleEntityList.size() >= 1) { + reservationVO.setStockArticleList(stockArticleEntityList); + } +// DistributionReservationVO distributionReservationVO = distributionReservationMapper.getReservationDetail(reservationId); + return R.data(reservationVO); } @Override @@ -154,9 +178,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl packageList = s.getPackageList(); - if (s.getIsHaveData().equals(ServiceConstant.ORDER_HAVE_DATA)){ - if (packageList.size() == 0){ - if (s.getIsHaveData() == 2 ){ - Map map = new HashMap<>(); - map.put("stockArticleId",s.getId()); - QueryWrapper qw = Condition.getQueryWrapper(map, DistributionParcelListEntity.class); - //添加订单下的所有在库订单的包件 - List distributionParcelListEntities = distributionParcelListService.getBaseMapper().selectList(qw); - distributionParcelListEntities.forEach(p->{ - DistributionReservationPackageEntity distributionReservationPackageEntity = new DistributionReservationPackageEntity(); - distributionReservationPackageEntity.setReservationId(reservationId); - distributionReservationPackageEntity.setParceListId(p.getId()); - distributionReservationPackageEntity.setStockArticleId(s.getId()); - distributionReservationPackageEntity.setPacketBarCode(p.getPacketBarCode()); - //维护订单下包件信息 - distributionReservationPackageService.save(distributionReservationPackageEntity); - //此时订单下的所有包件都处于预约状态，可用数为0 - packageNum.getAndIncrement(); - }); - } - s.setAvailableQuantity(0); - }else { - //维护选中的包件信息 - packageList.forEach(p->{ + if (packageList.size() == 0) { + if (s.getIsHaveData() == 2) { + Map map = new HashMap<>(); + map.put("stockArticleId", s.getId()); + QueryWrapper qw = Condition.getQueryWrapper(map, DistributionParcelListEntity.class); + //添加订单下的所有在库订单的包件 + List distributionParcelListEntities = distributionParcelListService.getBaseMapper().selectList(qw); + distributionParcelListEntities.forEach(p -> { DistributionReservationPackageEntity distributionReservationPackageEntity = new DistributionReservationPackageEntity(); distributionReservationPackageEntity.setReservationId(reservationId); distributionReservationPackageEntity.setParceListId(p.getId()); distributionReservationPackageEntity.setStockArticleId(s.getId()); - distributionReservationPackageMapper.insert(distributionReservationPackageEntity); + distributionReservationPackageEntity.setPacketBarCode(p.getPacketBarCode()); + //维护订单下包件信息 + distributionReservationPackageService.save(distributionReservationPackageEntity); + //此时订单下的所有包件都处于预约状态，可用数为0 packageNum.getAndIncrement(); }); - //设置订单可用数量为 - s.setAvailableQuantity(s.getHandQuantity() - s.getReservationNum()); } - distributionReservationStockarticleEntity.setReservationNum(packageNum.get()); - }else { - distributionReservationStockarticleEntity.setIsHaveData(ServiceConstant.ORDER_NOT_HAVE_DATA); - distributionReservationStockarticleEntity.setReservationNum(s.getTotalNumber()); + s.setAvailableQuantity(0); + } else { + //维护选中的包件信息 + packageList.forEach(p -> { + DistributionReservationPackageEntity distributionReservationPackageEntity = new DistributionReservationPackageEntity(); + distributionReservationPackageEntity.setReservationId(reservationId); + distributionReservationPackageEntity.setParceListId(p.getId()); + distributionReservationPackageEntity.setStockArticleId(s.getId()); + distributionReservationPackageMapper.insert(distributionReservationPackageEntity); + packageNum.getAndIncrement(); + }); + //设置订单可用数量为 + s.setAvailableQuantity(s.getHandQuantity() - s.getReservationNum()); } + distributionReservationStockarticleEntity.setReservationNum(packageNum.get()); //订单无数据源，不需要进行包件信息维护 //修改订单状态为已预约 s.setState(ServiceConstant.ORDER_STATE_ALREADY_RESERVATION); @@ -276,7 +295,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl ids = Func.toLongList(reservationIds); - Map map = new HashMap<>(); + Map map = new HashMap<>(); //获取备货任务的编号 Long stockupEntityId = distributionStockupEntity.getId(); //统计包件数量 @@ -410,25 +429,25 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl{ + ids.forEach(i -> { //查询备货任务 - map.put("reservationId",i); + map.put("reservationId", i); QueryWrapper qw = Condition.getQueryWrapper(map, DistributionStockupInfoEntity.class); DistributionStockupInfoEntity distributionStockupInfoEntity = distributionStockupInfoService.getOne(qw); - if (Func.isEmpty(distributionStockupInfoEntity)){ + if (Func.isEmpty(distributionStockupInfoEntity)) { //1、预约单不存在备货任务 //利用中间表建立起预约和备货表之间的关系 DistributionStockupInfoEntity stockupInfoEntity = new DistributionStockupInfoEntity(); stockupInfoEntity.setReservationId(i); stockupInfoEntity.setStockupId(stockupEntityId); distributionStockupInfoService.save(stockupInfoEntity); - }else { + } else { //TODO 这里还需要考虑一个备货任务下只有一条记录 //获取备货任务编号 Long stockupId = distributionStockupInfoEntity.getStockupId(); DistributionStockupEntity stockupEntity = distributionStockupService.getById(stockupId); //2、预约单存在备货任务还未指派 - if (Func.equals(stockupEntity.getAssignStatus(),ServiceConstant.STOCkUP_ASSIGNSTATUS_ABSENCE)){ + if (Func.equals(stockupEntity.getAssignStatus(), ServiceConstant.STOCkUP_ASSIGNSTATUS_ABSENCE)) { //对原有的备货关系进行修改 distributionStockupInfoEntity.setStockupId(stockupEntityId); distributionStockupInfoService.updateById(distributionStockupInfoEntity); @@ -464,8 +483,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl o = Condition.getQueryWrapper(map, DistributionReservationPackageEntity.class); o.lambda().eq(DistributionReservationPackageEntity::getReservationId, reservationEntity.getId()); List reservationPackageEntityList = distributionReservationPackageService.getBaseMapper().selectList(o); - if (!Func.isEmpty(reservationStockarticleEntityList)){ - reservationStockarticleEntityList.forEach(r->{ + if (!Func.isEmpty(reservationStockarticleEntityList)) { + reservationStockarticleEntityList.forEach(r -> { //查询订单信息，完成对订单的信息修改 DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(r.getStockArticleId()); //拼接订单编号 @@ -505,7 +524,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl r.getReservationNum()){ + if (stockArticleEntity.getHandQuantity() > r.getReservationNum()) { //这里表示订单下的包件没有进行全部配送 //修改订单状态为部分配送 stockArticleEntity.setState(4); @@ -516,9 +535,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl{ + reservationStocklistEntityList.forEach(l -> { DistributionStockListEntity stockListEntity = distributionStockListService.getById(l.getStocklistId()); stockListEntity.setQuantityStock(stockListEntity.getQuantityStock() - l.getReservationNum()); hashSet.add(stockListEntity.getOrderSelfNumbering()); @@ -539,7 +558,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl allocationInfo = allocationDTO.getAllocationInfo(); - allocationInfo.forEach(a->{ + allocationInfo.forEach(a -> { DistributionDeliverySelfEntity distributionDeliverySelfEntity = Func.copy(a, DistributionDeliverySelfEntity.class); //设置车辆编号 distributionDeliverySelfEntity.setDeliveryId(Long.parseLong(a.getDriverId())); @@ -568,9 +587,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl1){ - distributionDeliveryListEntity.setOrderId(orderIds.deleteCharAt(orderIds.length()-1).toString()); + distributionDeliveryListEntity.setOrderSelfNumbering(String.join(",", hashSet)); + if (orderIds.length() > 1) { + distributionDeliveryListEntity.setOrderId(orderIds.deleteCharAt(orderIds.length() - 1).toString()); } distributionDeliveryListEntity.setReservationId(reservationIds); distributionDeliveryListEntity.setDeliveryNumber(packageNum.get()); @@ -604,6 +623,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl getReservationInfo(String reservationId) { //查询出预约信息 @@ -624,8 +644,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl stockArticleVOList = Func.copy(stockArticleEntityList, DistributionStockArticleVO.class); //查询出 库存信息 - reservationVO.setStockArticleList(stockArticleEntityList); + reservationVO.setStockArticleList(stockArticleVOList); } if (!Func.isEmpty(reservationStocklistEntityList)) { List stockArticleEntityList = new ArrayList<>(); @@ -634,8 +655,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl stockListVOList = Func.copy(stockArticleEntityList, DistributionStockListVO.class); //查询出 库存信息 - reservationVO.setInventoryList(stockArticleEntityList); + reservationVO.setInventoryList(stockListVOList); } return R.data(reservationVO); } @@ -677,7 +699,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl { Long stocklistId = r1.getStocklistId(); DistributionStockListEntity stockListEntity = distributionStockListService.getById(stocklistId); - stockListEntity.setQuantityOccupied(stockListEntity.getQuantityOccupied()-r1.getReservationNum()); + stockListEntity.setQuantityOccupied(stockListEntity.getQuantityOccupied() - r1.getReservationNum()); stockListEntity.setQuantityOccupied(stockListEntity.getQuantityOccupied() + r1.getReservationNum()); //这里对原表进行物理删除 distributionStockListService.updateById(stockListEntity); @@ -703,13 +725,13 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl { List packageList = s.getPackageList(); AtomicInteger packageNum = new AtomicInteger(); - if (packageList.size() == 0){ - Map map = new HashMap<>(); - map.put("stockArticleId",s.getId()); + if (packageList.size() == 0) { + Map map = new HashMap<>(); + map.put("stockArticleId", s.getId()); QueryWrapper qw = Condition.getQueryWrapper(map, DistributionParcelListEntity.class); //添加订单下的所有在库订单 List distributionParcelListEntities = distributionParcelListService.getBaseMapper().selectList(qw); - distributionParcelListEntities.forEach(p->{ + distributionParcelListEntities.forEach(p -> { packageNum.getAndIncrement(); DistributionReservationPackageEntity distributionReservationPackageEntity = new DistributionReservationPackageEntity(); distributionReservationPackageEntity.setReservationId(distributionReservationDTO.getId()); @@ -721,9 +743,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl{ + packageList.forEach(p -> { packageNum.getAndIncrement(); DistributionReservationPackageEntity distributionReservationPackageEntity = new DistributionReservationPackageEntity(); distributionReservationPackageEntity.setReservationId(distributionReservationDTO.getId()); @@ -781,8 +803,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl deliveryBusinessTask(DistributionDeliveryAllocationDTO allocationDTO) { - if (Func.isEmpty(allocationDTO)){ - log.error("参数异常allocationDTO+{"+allocationDTO+"}"); + if (Func.isEmpty(allocationDTO)) { + log.error("参数异常allocationDTO+{" + allocationDTO + "}"); return R.fail("服务器正忙!!!"); } //1、添加配送任务 @@ -801,7 +823,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl distributionStockArticleDTOS = storeClient.get(""); Map> mallClient = distributionStockArticleDTOS.stream().collect(Collectors.groupingBy(DistributionStockArticleDTO::getMallName)); //3、维护订单和客户 - storeClient.forEach((k,v)->mallClient.merge(k,v,(v1,v2)->v2)); + storeClient.forEach((k, v) -> mallClient.merge(k, v, (v1, v2) -> v2)); //统计客户数 AtomicInteger clientNum = new AtomicInteger(); @@ -822,8 +844,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl{ - if (!Func.isBlank(k)){ + mallClient.forEach((k, v) -> { + if (!Func.isBlank(k)) { ////统计客户数 //预约任务是在客户的维度上进行数据维护 DistributionReservationDTO reservation = allocationDTO.getReservation(); @@ -849,7 +871,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl initTotal = new AtomicReference<>(BigDecimal.ZERO); //统计包件数量 AtomicInteger packageNum = new AtomicInteger(); - v.forEach(a->{ + v.forEach(a -> { orderTotal.getAndIncrement(); //TODO 这里还需要对库存品进行筛选 DistributionStockArticleEntity stockArticleEntity = Func.copy(a, DistributionStockArticleEntity.class); @@ -862,16 +884,16 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl packageList = a.getPackageList(); - if (a.getPackageList().size() == 0){ - Map map = new HashMap(); + if (a.getPackageList().size() == 0) { + Map map = new HashMap(); //这里就是默认添加订单下的所有包件 - map.put("stockArticleId",stockArticleEntity.getId()); + map.put("stockArticleId", stockArticleEntity.getId()); QueryWrapper o = Condition.getQueryWrapper(map, DistributionParcelListEntity.class); // o.lambda().eq(DistributionParcelListEntity::getStockArticleId, stockArticleEntity.getId()); List parcelListEntityList = distributionParcelListService.getBaseMapper().selectList(o); - parcelListEntityList.forEach(p->{ + parcelListEntityList.forEach(p -> { packageCount.getAndIncrement(); DistributionReservationPackageEntity reservationPackageEntity = new DistributionReservationPackageEntity(); reservationPackageEntity.setReservationId(reservationEntity.getId()); @@ -880,9 +902,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl{ + packageList.forEach(p -> { packageCount.getAndIncrement(); DistributionReservationPackageEntity reservationPackageEntity = new DistributionReservationPackageEntity(); reservationPackageEntity.setReservationId(reservationEntity.getId()); @@ -895,7 +917,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl allocationInfo = allocationDTO.getAllocationInfo(); - allocationInfo.forEach(a->{ + allocationInfo.forEach(a -> { DistributionDeliverySelfEntity distributionDeliverySelfEntity = Func.copy(a, DistributionDeliverySelfEntity.class); //设置车辆编号 distributionDeliverySelfEntity.setDeliveryId(Long.parseLong(a.getDriverId())); @@ -952,7 +974,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl getReservationPackage(String reservationId, String id) { + DistributionReservationPackageDTO reservationPackageDTO = new DistributionReservationPackageDTO(); + reservationPackageDTO.setReservationId(Long.parseLong(reservationId)); + reservationPackageDTO.setStockArticleId(Long.parseLong(id)); + List parcelListEntityList = distributionReservationPackageMapper.getReservationPackage(reservationPackageDTO); + return R.data(parcelListEntityList); + } + + @Override + public R getReservationPackageList(String reservationId) { + if (Func.isBlank(reservationId)) { + log.error("参数异常reservationId+{" + reservationId + "}"); + return R.fail("服务器正忙!!"); + } + List distributionParcelListEntityList = distributionReservationPackageMapper.getReservationPackageList(reservationId); + return R.data(distributionParcelListEntityList); + } }