diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java index e9f22826b..4877705f4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java @@ -198,7 +198,7 @@ public class ClerkCheckPushDataQueueHandler { Boolean b = oldSystemDataPushClient.pushOldSystemSignInfo(delivery); } catch (Exception e) { - e.printStackTrace(); + log.error(">>>>> 推送老系统签收信息报错",e); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index 2d97c9579..6d25ee5ab 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -1561,23 +1561,24 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { if (Func.isNotEmpty(distributionReservationStockarticleEntities)) { log.info(">>>brand 进入 长度 {} ", distributionReservationStockarticleEntities); - //存在订单 List orderIds = distributionReservationStockarticleEntities.stream().filter(f -> f.getIsZero().equals(IsOrNoConstant.no.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList()); - log.info(">>>brand 进入 orderIds {} ", orderIds); + if (ObjectUtils.isNotNull(orderIds) && !orderIds.isEmpty()){ + log.info(">>>brand 进入 orderIds {} ", orderIds); - List distributionStockArticleEntities = distributionStockArticleService.listByIds(orderIds); - log.info(">>>brand 进入 distributionStockArticleEntities {} ", distributionStockArticleEntities); + List distributionStockArticleEntities = distributionStockArticleService.listByIds(orderIds); + log.info(">>>brand 进入 distributionStockArticleEntities {} ", distributionStockArticleEntities); - if (Func.isNotEmpty(distributionStockArticleEntities)) { - String[] split = Func.split(brands, ","); - log.info(">>>brand 进入 split {} ", (Object) split); + if (Func.isNotEmpty(distributionStockArticleEntities)) { + String[] split = Func.split(brands, ","); + log.info(">>>brand 进入 split {} ", (Object) split); - //包件信息列表 - brand = handkeBrandsPackageList(split, distributionStockArticleEntities, warehouseName, distributionReservationEntity.getId(), distributionDeliveryListEntity.getOrderCode(), warehouseId); + //包件信息列表 + brand = handkeBrandsPackageList(split, distributionStockArticleEntities, warehouseName, distributionReservationEntity.getId(), distributionDeliveryListEntity.getOrderCode(), warehouseId); + } + log.info(">>>brand 进入 {} ", brand); } - log.info(">>>brand 进入 {} ", brand); } @@ -1810,8 +1811,11 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { //统计已装车数量 WarehouseWaybillEntity byWaybillNo = waybillClient.findByWaybillNo(k); AddWaybillTrackDTO addWaybillTrackDTO = new AddWaybillTrackDTO(); - addWaybillTrackDTO.setWaybillId(byWaybillNo.getId()); - addWaybillTrackDTO.setWaybillNo(byWaybillNo.getWaybillNo()); + if(ObjectUtils.isNotNull(byWaybillNo)){ + addWaybillTrackDTO.setWaybillId(byWaybillNo.getId()); + addWaybillTrackDTO.setWaybillNo(byWaybillNo.getWaybillNo()); + } + if (1 == a) { int sum = v.stream().filter(p -> OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(p.getOrderPackageLoadingStatus())).mapToInt(DistributionParcelListEntity::getQuantity).sum(); addWaybillTrackDTO.setTrackType("90"); 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 f09a5ab65..de79c42cc 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 @@ -6334,6 +6334,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl> loadingMap = null; Map> reservationMap = null; if (!loadscanEntityList.isEmpty()){ - loadingMap = loadscanEntityList.stream().collect(Collectors.groupingBy(DistributionLoadscanEntity::getPackageId)); + loadingNumber = signforEntity.getLoadedNumber() - loadscanEntityList.stream().mapToInt(DistributionLoadscanEntity::getLoadedNub).sum(); + signingNumber = signforEntity.getReceivedQuantity() - loadscanEntityList.stream().mapToInt(DistributionLoadscanEntity::getReceivedQuantity).sum(); + loadingMap = loadscanEntityList.stream().collect(Collectors.groupingBy(DistributionLoadscanEntity::getPackageId)); } //查询对应的计划品类 List reservationZeroPackageEntity = distributionReservationZeroPackageService.list(Wrappers.query().lambda() @@ -5330,6 +5332,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl zeroPackageEntities = reservationMap.get(parcelNumberDTO.getParcelListId()); DistributionParcelNumberEntity distributionParcelNumberEntity = distributionParcelNumberService.getOne(Wrappers.query().lambda() @@ -5354,15 +5358,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl distributionReservationZeroPackageEntity.getQuantity()){ log.info("#############零担签收超过计划数量ParcelListId:{},计划:{}录入,:{}",parcelNumberDTO.getParcelListId(),distributionReservationZeroPackageEntity.getQuantity(),parcelNumberDTO.getSigningNum()); } - int i1 =parcelNumberDTO.getSigningNum() - distributionLoadscanEntity.getReceivedQuantity() ; - signingNumber += i1; - int i2 = parcelNumberDTO.getSigningNum() -distributionLoadscanEntity.getLoadedNub() ; - loadingNumber += i2; if (distributionLoadscanEntity.getLoadedNub() < parcelNumberDTO.getSigningNum()){ //将装车和签收进行统一数量 distributionLoadscanEntity.setLoadedNub(parcelNumberDTO.getSigningNum()); distributionLoadscanEntity.setPackageNub(parcelNumberDTO.getSigningNum()); } + deliveryNumber = distributionParcelNumberEntity.getDeliveryQuantity() + distributionLoadscanEntity.getReceivedQuantity() - parcelNumberDTO.getSigningNum(); handQuantity = distributionParcelNumberEntity.getHandQuantity() + distributionLoadscanEntity.getReceivedQuantity() - parcelNumberDTO.getSigningNum(); outboundQuantity = distributionParcelNumberEntity.getOutboundQuantity() - distributionLoadscanEntity.getReceivedQuantity() + parcelNumberDTO.getSigningNum(); @@ -5373,8 +5374,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:"); diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml index 39f3ae8a4..6f7be516b 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml @@ -89,6 +89,7 @@ sum(if(t.is_abnormal_loading = 1, 0, 1)) exLoadedNum, sum(if(t.is_abnormal_signing = 1, 0, 1)) exReNum from logpm_distribution_loadscan t + where t.scan_status != 1 group by t.delivery_id) loadScan on loadScan.delivery_id = d.id left join (select t.delivery_id, @@ -215,6 +216,7 @@ sum(if(t.is_abnormal_loading = 1, 0, 1)) exLoadedNum, sum(if(t.is_abnormal_signing = 1, 0, 1)) exReNum from logpm_distribution_loadscan t + where t.scan_status != 1 group by t.delivery_id) loadScan on loadScan.delivery_id = lddl.id left join (select t.delivery_id,