From ca9d4b796ec57cc05a1ad7462a5dad30c86c5808 Mon Sep 17 00:00:00 2001 From: kilo Date: Sat, 7 Oct 2023 18:36:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=A3=85=E8=BD=A6=E5=8C=85?= =?UTF-8?q?=E4=BB=B6=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ributionReservationStockarticleEntity.java | 6 + .../vo/app/DistributionAppParcelListVO.java | 2 + .../vo/app/DistributionAppStockArticleVO.java | 11 + .../mapper/DistributionDeliveryInfoMapper.xml | 12 +- .../mapper/DistributionReservationMapper.java | 12 +- .../mapper/DistributionReservationMapper.xml | 13 + .../DistributionDeliveryInfoServiceImpl.java | 225 ++++++++++++++---- .../DistributionDeliveryListServiceImpl.java | 2 +- .../DistributionReservationServiceImpl.java | 8 +- 9 files changed, 239 insertions(+), 52 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStockarticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStockarticleEntity.java index 18b97c913..7a46a75e0 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStockarticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStockarticleEntity.java @@ -51,6 +51,12 @@ public class DistributionReservationStockarticleEntity extends TenantEntity { */ @ApiModelProperty(value = "预约数量") private Integer reservationNum; + + /** + * 是否是零担 0-否 1-是 + */ + @ApiModelProperty(value = "是否是零担") + private String isZero; /** * 订单码 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java index 0517c079f..7c77deff4 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java @@ -72,6 +72,8 @@ public class DistributionAppParcelListVO extends DistributionParcelListEntity { @ApiModelProperty(value = "签收状态") private Integer signforState; + + /** * 签收数量 * 1 未签 2 已签 diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java index 08840b1ea..ae8811173 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java @@ -50,6 +50,17 @@ public class DistributionAppStockArticleVO extends DistributionStockArticleEntit */ @ApiModelProperty(value = "签收(订单)") private Integer signforNub; + + /** + * 是否存在异常包间 + */ + @ApiModelProperty(value = "是否存在异常包间") + private Integer isHaveAbnormalPackage; + /** + * 是否存在异常包间 + */ + @ApiModelProperty(value = "是否存在异常包间") + private String isHaveAbnormalPackageName; /** * 签收完成数 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index 16ba8fc87..503fd43b0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -309,12 +309,14 @@ ldsa.complete_set completeSet, ldrs.reservation_num reservationNum, ldsa.id stockArticleId, + lds.is_have_abnormal_package AS isHaveAbnormalPackage, (SELECT COALESCE(COUNT(*), 0) from logpm_distribution_loadscan ldl - WHERE ldl.order_id =ldsa.id and ldl.scan_status !=1 and ldl.reservation_id = #{param.reservationId} ) loadingNub + WHERE ldl.order_id =ldsa.id and ldl.scan_status !=1 and ldl.reservation_id = #{param.reservationId} and ldl.is_abnormal_loading !=2 ) loadingNub FROM logpm_distribution_reservation ldr join logpm_distribution_reservation_stockarticle ldrs on ldr.id = ldrs.reservation_id + join logpm_distribution_signfor lds on lds.reservation_id = ldr.id join logpm_distribution_stock_article ldsa on ldsa.id =ldrs.stock_article_id ldr.is_deleted = 0 @@ -390,6 +392,7 @@ FROM ldsa.complete_set AS completeSet, ldrs.reservation_num AS reservationNum, ldsa.id stockArticleId, + lds.is_have_abnormal_package AS isHaveAbnormalPackage, loadingNub FROM ( @@ -406,6 +409,7 @@ FROM ) AS loading JOIN logpm_distribution_reservation_stockarticle ldrs ON loading.stock_article_id = ldrs.stock_article_id and ldrs.stock_article_status in (1,3) JOIN logpm_distribution_reservation ldr ON ldr.id = ldrs.reservation_id + JOIN logpm_distribution_signfor lds ON ldr.id = lds.reservation_id JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldrs.stock_article_id @@ -429,6 +433,7 @@ FROM ldsa.complete_set AS completeSet, ldrs.reservation_num AS reservationNum, ldsa.id stockArticleId, + lds.is_have_abnormal_package AS isHaveAbnormalPackage, loadingNub FROM ( @@ -445,6 +450,7 @@ FROM ) AS loading JOIN logpm_distribution_reservation_stockarticle ldrs ON loading.stock_article_id = ldrs.stock_article_id and ldrs.stock_article_status in (1,3) JOIN logpm_distribution_reservation ldr ON ldr.id = ldrs.reservation_id + JOIN logpm_distribution_signfor lds ON ldr.id = lds.reservation_id JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldrs.stock_article_id ldr.is_deleted = 0 @@ -465,6 +471,7 @@ FROM ldsa.complete_set AS completeSet, ldrs.reservation_num AS reservationNum, ldsa.id stockArticleId, + lds.is_have_abnormal_package AS isHaveAbnormalPackage, loadingNub FROM ( @@ -481,6 +488,7 @@ FROM ) AS loading JOIN logpm_distribution_reservation_stockarticle ldrs ON loading.stock_article_id = ldrs.stock_article_id and ldrs.stock_article_status in (1,3) JOIN logpm_distribution_reservation ldr ON ldr.id = ldrs.reservation_id + JOIN logpm_distribution_signfor lds ON ldr.id = lds.reservation_id JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldrs.stock_article_id ldr.is_deleted = 0 @@ -511,7 +519,7 @@ FROM LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldr.id = ldrp.reservation_id LEFT JOIN logpm_warehouse_tray_goods AS lwtg ON lwtg.association_id = ldrp.parce_list_id JOIN logpm_warehouse_tray_goods AS lwtga ON lwtg.id = lwtga.id - WHERE lds.reservation_id = #{reservationId} + WHERE lds.reservation_id = #{reservationId} and lwtg.association_type in ('3') GROUP BY lwtg.tray_id,lds.reservation_id,lwtg.tray_code,lwtg.num,lwtg.association_type 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 654f5721d..5189ea4cd 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 @@ -22,10 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.dto.DistributionReservationDTO; import com.logpm.distribution.entity.*; import com.logpm.distribution.excel.DistributionReservationExcel; -import com.logpm.distribution.vo.DistributionReservationVO; -import com.logpm.distribution.vo.DistributionStockListVO; -import com.logpm.distribution.vo.DistributionStockupOrderListVO; -import com.logpm.distribution.vo.DistributionStockupStockListVO; +import com.logpm.distribution.vo.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -222,4 +219,11 @@ public interface DistributionReservationMapper extends BaseMapper getMaterialNameByStockArticleIdAndReservationId(@Param("stockArticleId") Long stockArticleId, @Param("reservationId") Long reservationId); List> getCategoryByStockArticleIdAndReservationId(@Param("stockArticleId") Long stockArticleId, @Param("reservationId") Long reservationId); + + /** + * 查询预约订单信息 + * @param parseLong + * @return + */ + List selectOrderInfoByReservationId(Long parseLong); } 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 a05b43484..6a71762ee 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 @@ -951,5 +951,18 @@ and ldrp.stock_article_id = #{stockArticleId} group by IFNULL(ldpl.third_product,'其他') + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java index 130271489..52bb87e2a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java @@ -21,14 +21,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.distribution.dto.DistributionDeliveryInfoDTO; import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO; -import com.logpm.distribution.entity.DistributionDeliveryInfoEntity; -import com.logpm.distribution.entity.DistributionLoadscanEntity; -import com.logpm.distribution.entity.DistributionParcelListEntity; +import com.logpm.distribution.entity.*; import com.logpm.distribution.excel.DistributionDeliveryInfoExcel; import com.logpm.distribution.mapper.DistributionDeliveryInfoMapper; +import com.logpm.distribution.mapper.DistributionReservationMapper; import com.logpm.distribution.mapper.DistributionReservationPackageMapper; +import com.logpm.distribution.mapper.DistributionReservationStockarticleMapper; import com.logpm.distribution.service.IDistributionDeliveryInfoService; import com.logpm.distribution.service.IDistributionLoadscanService; +import com.logpm.distribution.service.IDistributionParcelListService; +import com.logpm.distribution.service.IDistributionStockArticleService; import com.logpm.distribution.vo.DistributionDeliveryInfoVO; import com.logpm.distribution.vo.DistributionParcelListVO; import com.logpm.distribution.vo.DistributionStockArticleVO; @@ -38,13 +40,21 @@ import com.logpm.distribution.vo.app.DistributionAppStockArticleVO; import com.logpm.distribution.wrapper.DistributionParcelListWrapper; import com.logpm.distribution.wrapper.DistributionStockArticleWrapper; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.loading.LoadingStatusConstant; +import org.springblade.common.constant.reservation.ReservationOrderStatusConstant; +import org.springblade.common.serviceConstant.ServiceConstant; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.Func; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 配送装车中间表 服务实现类 @@ -54,13 +64,21 @@ import java.util.List; */ @Service @AllArgsConstructor +@Slf4j public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl implements IDistributionDeliveryInfoService { private DistributionReservationPackageMapper distributionReservationPackageMapper; + private DistributionReservationStockarticleMapper distributionReservationStockarticleMapper; private IDistributionLoadscanService distributionLoadscanService; + private DistributionReservationMapper distributionReservationMapper; + + private IDistributionParcelListService distributionParcelListService; + + private IDistributionStockArticleService distributionStockArticleService; + @Override public IPage selectDistributionDeliveryInfoPage(IPage page, DistributionDeliveryInfoVO distributionDeliveryInfo) { List distributionDeliveryInfoVOS = baseMapper.selectDistributionDeliveryInfoPage(page, distributionDeliveryInfo); @@ -142,49 +160,174 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl selectDistributionAppDeliveryorder(IPage page, DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) { - List distributionAppStockArticleVOS = new ArrayList<>(); - distributionAppStockArticleVOS = baseMapper.selectDistributionAppDeliveryOrderPage(page, distributionAppDeliveryListDTO); - if (null != distributionAppDeliveryListDTO.getCompletecode()) { - if (distributionAppDeliveryListDTO.getCompletecode() == 2) { - distributionAppStockArticleVOS = baseMapper.selectDistributionAppDeliveryOrderCompletewPage(page, distributionAppDeliveryListDTO); - } else if (distributionAppDeliveryListDTO.getCompletecode() == 1) { - distributionAppStockArticleVOS = baseMapper.selectDistributionAppDeliveryOrderCompmletePage(page, distributionAppDeliveryListDTO); - } else if (distributionAppDeliveryListDTO.getCompletecode() == 3) { - distributionAppStockArticleVOS = baseMapper.selectDistributionAppDeliveryOrderCompcletePage(page, distributionAppDeliveryListDTO); - } +//-------------------------------------2023-10-07 客户查看订单详情----------------------------------------------------------------- +// 这里先查询出客户的订单信息，然后查询订单的预约包件信息 + long reservationId = Long.parseLong(distributionAppDeliveryListDTO.getReservationId()); + List stockArticleVOS = distributionReservationMapper.selectOrderInfoByReservationId(reservationId); +// List packageListByReservationId = distributionReservationMapper.selectPackageListByReservationId(Long.parseLong(distributionAppDeliveryListDTO.getReservationId())); + if (Func.isEmpty(stockArticleVOS)){ + //错误数据 + log.error("#################预约订单异常：{}",stockArticleVOS); + return null; } - //数量转换字典 - distributionAppStockArticleVOS.forEach(e -> { - // 需要根据当前的客户的ID查询对应的包件信息 - List ks = distributionReservationPackageMapper.getOrderPackageListByOrderCode(e.getStockArticleId()); - ks.forEach(k -> { - List list = distributionLoadscanService.list(Wrappers.query().lambda() - .eq(DistributionLoadscanEntity::getOrderPackageCode, k.getOrderPackageCode()) - .eq(DistributionLoadscanEntity::getReservationId, k.getReservationId()) - .apply("scan_status != 1") - ); - if (!list.isEmpty()) { - k.setScanStatus(2); - k.setIsScan("已扫"); - } else { - k.setScanStatus(1); - k.setIsScan("未扫"); + List distributionAppStockArticleVOS = new ArrayList<>(); + List loadscanEntityList = distributionLoadscanService.list(Wrappers.query().lambda().eq(DistributionLoadscanEntity::getReservationId, distributionAppDeliveryListDTO.getReservationId()).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())); + Map> orderInfo = loadscanEntityList.stream().collect(Collectors.groupingBy(DistributionLoadscanEntity::getOrderId)); + stockArticleVOS.forEach(ord->{ + DistributionAppStockArticleVO distributionAppStockArticleVO = new DistributionAppStockArticleVO(); + distributionAppStockArticleVO.setOrderCode(ord.getOrderCode()); + distributionAppStockArticleVO.setReservationNum(ord.getReservationNum()); + Map loadingPackage = new HashMap<>(); + if (ord.getIsHaveData().equals(ServiceConstant.ORDER_HAVE_DATA)){ + List parcelListEntities = distributionReservationMapper.selectPackageByReservationAndStockArticle(reservationId, ord.getId()); + if (Func.isNotEmpty(orderInfo.get(ord.getId()))){ + loadingPackage = orderInfo.get(ord.getId()).stream().collect(Collectors.toMap(DistributionLoadscanEntity::getPackageId, Function.identity(), (k1, k2) -> k2)); } - }); - e.setDistributionAppParcelListVOS(ks); - - if (e.getLoadingNub() == 0) { - e.setComplete("未扫"); - e.setCompletecode(1); - } else if (e.getLoadingNub() < e.getReservationNum()) { - e.setComplete("部分扫"); - e.setCompletecode(2); - } else { - e.setComplete("齐套"); - e.setCompletecode(3); + List ks = new ArrayList<>(); + AtomicInteger atomicInteger = new AtomicInteger(); +// 装车数量 + AtomicInteger loadingNum = new AtomicInteger(); + for (DistributionParcelListEntity parcelListEntity : parcelListEntities) { + DistributionAppParcelListVO appParcelListVO = Func.copy(parcelListEntity, DistributionAppParcelListVO.class); + if (Func.isNotEmpty(loadingPackage.get(parcelListEntity.getId()))){ + atomicInteger.getAndIncrement(); + appParcelListVO.setScanStatus(2); + appParcelListVO.setIsScan("已扫"); + loadingPackage.remove(parcelListEntity.getId()); + loadingNum.getAndAdd(parcelListEntity.getQuantity()); + //这里就是表示计划中的包件装车了 + //需要对该包件的装车数量进行统计 + }else { + //此时这个订单内还存在装车的包件，这些包件就是异常装车的包件了 + appParcelListVO.setScanStatus(1); + appParcelListVO.setIsScan("未扫"); + } + ks.add(appParcelListVO); + } + + if (Func.isNotEmpty(loadingPackage)){ + //该订单存在有异常装车包件 + loadingPackage.forEach((k,v)->{ + DistributionParcelListEntity parcelListServiceById = distributionParcelListService.getById(v.getPackageId()); + DistributionAppParcelListVO appParcelListVO = Func.copy(parcelListServiceById, DistributionAppParcelListVO.class); + loadingNum.getAndAdd(v.getPackageNub()); + appParcelListVO.setScanStatus(3); + appParcelListVO.setIsScan("异常"); + + ks.add(appParcelListVO); + }); + distributionAppStockArticleVO.setIsHaveAbnormalPackage(1); + distributionAppStockArticleVO.setIsHaveAbnormalPackageName("异常"); + } + distributionAppStockArticleVO.setDistributionAppParcelListVOS(ks); + distributionAppStockArticleVO.setLoadingNub(loadingNum.get()); + if (atomicInteger.get() ==ord.getReservationNum()){ + distributionAppStockArticleVO.setCompletecode(3); + distributionAppStockArticleVO.setComplete("计划齐套"); + }else if (atomicInteger.get()== 0 ){ + distributionAppStockArticleVO.setCompletecode(1); + distributionAppStockArticleVO.setComplete("计划未扫"); + }else { + distributionAppStockArticleVO.setCompletecode(2); + distributionAppStockArticleVO.setComplete("部分扫"); + } + //此订单存在数据源 + //查询该订单 + }else { + //TODO 无数据源订单... + } + distributionAppStockArticleVOS.add(distributionAppStockArticleVO); + if (Func.isNotEmpty(orderInfo.get(ord.getId()))){ + orderInfo.remove(ord.getId()); } }); + if (Func.isNotEmpty(orderInfo)){ + //整个订单都是异常装车 + orderInfo.forEach((k,v)->{ + AtomicInteger loadingNum = new AtomicInteger(); + DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(k); + DistributionAppStockArticleVO appStockArticleVO = Func.copy(stockArticleEntity, DistributionAppStockArticleVO.class); + List distributionAppParcelListVOS = new ArrayList<>(); + for (DistributionLoadscanEntity loadscanEntity : v) { + DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(loadscanEntity.getPackageId()); + DistributionAppParcelListVO parcelListVO = Func.copy(parcelListEntity, DistributionAppParcelListVO.class); + parcelListVO.setScanStatus(3); + parcelListVO.setIsScan("异常"); + loadingNum.getAndAdd(parcelListEntity.getQuantity()); + distributionAppParcelListVOS.add(parcelListVO); + + } + appStockArticleVO.setLoadingNub(loadingNum.get()); + appStockArticleVO.setDistributionAppParcelListVOS(distributionAppParcelListVOS); + appStockArticleVO.setReservationNum(0); + distributionAppStockArticleVOS.add(appStockArticleVO); + }); + } + + + + + + + + + + +// packageListByReservationId.stream().collect(Collectors.groupingBy()) + + +// List distributionAppStockArticleVOS = new ArrayList<>(); +// +// distributionAppStockArticleVOS = baseMapper.selectDistributionAppDeliveryOrderPage(page, distributionAppDeliveryListDTO); +// if (null != distributionAppDeliveryListDTO.getCompletecode()) { +// if (distributionAppDeliveryListDTO.getCompletecode() == 2) { +// distributionAppStockArticleVOS = baseMapper.selectDistributionAppDeliveryOrderCompletewPage(page, distributionAppDeliveryListDTO); +// } else if (distributionAppDeliveryListDTO.getCompletecode() == 1) { +// distributionAppStockArticleVOS = baseMapper.selectDistributionAppDeliveryOrderCompmletePage(page, distributionAppDeliveryListDTO); +// } else if (distributionAppDeliveryListDTO.getCompletecode() == 3) { +// distributionAppStockArticleVOS = baseMapper.selectDistributionAppDeliveryOrderCompcletePage(page, distributionAppDeliveryListDTO); +// } +// } +// +// //数量转换字典 +// distributionAppStockArticleVOS.forEach(e -> { +// // 需要根据当前的客户的ID查询对应的包件信息 +// List ks = distributionReservationPackageMapper.getOrderPackageListByOrderCode(e.getStockArticleId()); +// if (e.getIsHaveAbnormalPackage() == 2) { +// //查询异常装车的包件，此时异常装车包件不在计划中 +// List distributionLoadscanEntities = distributionLoadscanService.list(Wrappers.query().lambda() +// .eq(DistributionLoadscanEntity::getReservationId, distributionAppDeliveryListDTO.getReservationId()) +// .ne(DistributionLoadscanEntity::getScanStatus, "1")); +// +// +// } +// ks.forEach(k -> { +// List list = distributionLoadscanService.list(Wrappers.query().lambda() +// .eq(DistributionLoadscanEntity::getOrderPackageCode, k.getOrderPackageCode()) +// .eq(DistributionLoadscanEntity::getReservationId, k.getReservationId()) +// .apply("scan_status != 1") +// ); +// if (!list.isEmpty()) { +// k.setScanStatus(2); +// k.setIsScan("已扫"); +// } else { +// k.setScanStatus(1); +// k.setIsScan("未扫"); +// } +// }); +// e.setDistributionAppParcelListVOS(ks); +// if (e.getLoadingNub() == 0) { +// e.setComplete("未扫"); +// e.setCompletecode(1); +// } else if (e.getLoadingNub() < e.getReservationNum()) { +// e.setComplete("部分扫"); +// e.setCompletecode(2); +// } else { +// e.setComplete("齐套"); +// e.setCompletecode(3); +// } +// }); return page.setRecords(distributionAppStockArticleVOS); } 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 564799e94..a166be078 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 @@ -505,7 +505,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl packageList = s.getPackageListInfo(); if (Func.isEmpty(packageList)) { - Map map = new HashMap<>(); - map.put("stockArticleId", s.getId()); - QueryWrapper qw = Condition.getQueryWrapper(map, DistributionParcelListEntity.class); //添加订单下的所有在库订单的包件 - List distributionParcelListEntities = distributionParcelListService.getBaseMapper().selectList(qw); + List distributionParcelListEntities = distributionParcelListService.list(Wrappers.query().lambda().eq(DistributionParcelListEntity::getStockArticleId,s.getId())); distributionParcelListEntities.forEach(p -> { if (!Func.equals(p.getOrderPackageFreezeStatus(), OrderPackageFreezeStatusConstant.yidongjie.getValue()) && !Func.equals(p.getOrderPackageFreezeStatus(), OrderPackageReservationStatusConstant.yiyueyue.getValue())) { DistributionReservationPackageEntity distributionReservationPackageEntity = new DistributionReservationPackageEntity(); @@ -2277,6 +2276,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl