From ad3069759aca91b0472b35a1e013c17a8c24980f Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 11 Jan 2024 19:28:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E7=AD=BE=E6=94=B6=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E3=80=81=E5=BE=85=E7=AD=BE=E6=94=B6=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E7=AD=BE=E6=94=B6=E5=8C=85=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionSignforMapper.xml | 6 +-- .../impl/DistributionSignforServiceImpl.java | 47 ++++++++++++++++++- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index a18a2284c..327555b88 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -323,15 +323,15 @@ (ldr.reservation_num + ldr.reservation_stock_list_num - lds.received_quantity + receivedin_quantity ) unreceivedQuantity, lds.create_time createTime, CASE WHEN lds.signing_status ='2' THEN '文员签收' - WHEN lds.driver_signing ='2' THEN '司机签收' + WHEN lds.driver_signing ='2' THEN '已完成' ELSE '待签收' END signingStatusAll, CASE WHEN lds.signing_status ='2' THEN '文员已审核' WHEN lds.signing_status ='1' THEN '文员待审核' ELSE '待签收' END wenyuanSigningStatus, - CASE WHEN lds.driver_signing ='2' THEN '司机已签收' - WHEN lds.driver_signing ='1' THEN '司机未签收' + CASE WHEN lds.driver_signing ='2' THEN '已完成' + WHEN lds.driver_signing ='1' THEN '未完成' ELSE '待签收' END sijiSigningStatus, lds.signing_status, diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 0229e6ae8..d948519a9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -228,7 +228,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl disStockListDetailEntities = distributionReservationMapper.selectInventoryListByReservation(d.getReservationId()); @@ -429,7 +429,52 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl abnormalSignPackageLoading = distributionLoadscanService.list(Wrappers.query().lambda() + .eq(DistributionLoadscanEntity::getReservationId, byId.getReservationId()) + .eq(DistributionLoadscanEntity::getIsAbnormalLoading, 2) + .eq(DistributionLoadscanEntity::getIsAbnormalSigning, 2) + .eq(DistributionLoadscanEntity::getSignforState, LoadScanSigningStatusConstant.yiqianshou.getValue()) + .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) + ); //异常签收件数 + if (Func.isNotEmpty(abnormalSignPackageLoading)){ + Map packageLoadingMap = abnormalSignPackageLoading.stream().collect(Collectors.toMap(DistributionLoadscanEntity::getPackageId, Function.identity(), (k1, k2) -> k2)); + List packageIds = abnormalSignPackageLoading.stream().distinct().map(DistributionLoadscanEntity::getPackageId).collect(Collectors.toList()); + List distributionParcelListEntities = distributionParcelListService.listByIds(packageIds); + List distributionParcelListVOS = DistributionParcelListWrapper.build().listVO(distributionParcelListEntities); + distributionParcelListVOS.forEach(p->{ + DistributionNumberDetailDTO detailDTO = Func.copy(p, DistributionNumberDetailDTO.class); + if (Func.isNotEmpty(packageLoadingMap.get(p.getId()))){ + DistributionLoadscanEntity distributionLoadscanEntity = packageLoadingMap.get(p.getId()); + detailDTO.setLoadingTime(distributionLoadscanEntity.getScanTime()); + detailDTO.setLoadingStatusName(OrderPackageLoadingStatusConstant.weizhuancghe.getName()); + if (distributionLoadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())){ + //签收 + detailDTO.setSigningTime(distributionLoadscanEntity.getSigningTime()); + detailDTO.setSigningStatusName(OrderPackageStatusConstant.yiqianshou.getName()); + } + } + detailDTO.setStockupStatusName(p.getOrderPackageStockupStatusName()); + DistributionStockEntity distributionStockEntity = distributionStockMapper.selectOne(Wrappers.query().lambda() + .eq(DistributionStockEntity::getConditions, p.getConditions()) + .eq(DistributionStockEntity::getStockArticle, p.getStockArticleId()) + .eq(DistributionStockEntity::getParcelListId, p.getId()) + ); + if (Func.isNotEmpty(distributionStockEntity)){ + detailDTO.setStockupTime(distributionStockEntity.getCreateTime()); + } + detailDTO.setStockupStatusName(p.getOrderPackageStockupStatusName()); + if (detailDTO.getConditions().equals(1)){ + detailDTO.setConditionsName("订制品"); + }else if (detailDTO.getConditions().equals(2)){ + detailDTO.setConditionsName("库存品"); + }else { + detailDTO.setConditionsName("零担"); + } + detailDTOS.add(detailDTO); + }); + + } break; }