diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java index a8857e593..3d3156794 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java @@ -39,8 +39,13 @@ public enum WorkNodeEnums implements Serializable { PUTAWAY(240, "上架"), DELIST(250, "下架"), STOCKING_OPERATION(260, "备货作业"), + PLAN_DELIVERY(261, "计划配送"), + CANCEL_DELIVERY(262, "计划取消"), + PLAN_BILLOFLADING(263, "计划自提"), + CANCEL_BILLOFLADING(264, "取消自提"), DISTRIBUTION_LOADING(270, "配送装车"), DISTRIBUTION_ABNORMAL_LOADING(271, "异常装车"), + DISTRIBUTION_CANCEL_LOADING(272, "取消装车"), DISTRIBUTION_SIGN_FOR(280, "配送签收"), DISTRIBUTION_ABNORMAL_SIGN_FOR(281, "异常签收"), CLERK_REVIEW(290, "文员复核"); diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java index 2b84490e0..b9f8ac49b 100644 --- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java +++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java @@ -23,6 +23,6 @@ public class MerchantStatisticsDTO implements Serializable { private List orderInfoIds; - private Long balanceOrderId; + private Long balanceOrderInfoId; } diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/StatisticsBalanceRecordDTO.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/StatisticsBalanceRecordDTO.java index b693279b2..332887812 100644 --- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/StatisticsBalanceRecordDTO.java +++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/StatisticsBalanceRecordDTO.java @@ -4,11 +4,12 @@ import com.logpm.statistics.entity.StatisticsBalanceRecordEntity; import com.logpm.statistics.entity.StatisticsBalanceRecordPhotoEntity; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data public class StatisticsBalanceRecordDTO extends StatisticsBalanceRecordEntity { - private List recordPhotoEntityList; + private List recordPhotoEntityList = new ArrayList<>(); } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java index b9868e1d7..337c6f2fc 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java @@ -1155,14 +1155,24 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl processorVOS = list.stream().map(i -> { - if (i.getProcessingStatus().equals(ProcessorProcessingStatusStatusConstant.daichuli.getValue()) || i.getProcessingStatus().equals(ProcessorProcessingStatusStatusConstant.yichuli.getValue())) { - AftersalesProcessorVO processorVO = new AftersalesProcessorVO(); - BeanUtil.copyProperties(i, processorVO); - return processorVO; + + List processorVOS = new ArrayList<>(); + if (!list.isEmpty()) { + Iterator iterator = list.iterator(); + while (iterator.hasNext()){ + AftersalesProcessorEntity next = iterator.next(); + if (ProcessorProcessingStatusStatusConstant.daichuli.getValue().equals(next.getProcessingStatus()) + || ProcessorProcessingStatusStatusConstant.yichuli.getValue().equals(next.getProcessingStatus())){ + AftersalesProcessorVO processorVO = new AftersalesProcessorVO(); + BeanUtil.copyProperties(next, processorVO); + processorVOS.add(processorVO); + }else { + iterator.remove(); + } } - return null; - }).collect(Collectors.toList()); + + } + aftersalesWorkOrderVO.setProcessorVOList(processorVOS); //查询包件 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 4713cfa86..1554d7177 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 @@ -783,7 +783,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>>>>>>>Warehouse:{},ScanUser:{},TrainNumber:{},ReservationCode:{}",myCurrentWarehouse.getName(),distributionLoadscanEntity.getSigningUser(),deliveryListEntity.getTrainNumber(),distributionReservationEntity.getReservationCode()); + String content = "包件在"+myCurrentWarehouse.getName()+"由"+distributionLoadscanEntity.getSigningUser()+"扫描签收,装车方式:补录装车,配送车次号:"+deliveryListEntity.getTrainNumber()+"预约任务号:"+distributionReservationEntity.getReservationCode(); JSONObject trunklinePackageTrackLog= new JSONObject(); trunklinePackageTrackLog.put("tenantId",distributionLoadscanEntity.getTenantId()); trunklinePackageTrackLog.put("createTime",distributionLoadscanEntity.getCreateTime()); @@ -2594,9 +2594,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl packageIds = new ArrayList<>(); List packageCodes = new ArrayList<>(); + List aaa = new ArrayList<>(); if (Func.isNotEmpty(parcelListEntityList)) { loadingPackageNum += parcelListEntityList.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum(); signingPackageNum += parcelListEntityList.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum(); @@ -5129,7 +5130,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl list = balanceAbnormalService.list(balanceAbnormalEntityQueryWrapper); + + if(list.isEmpty()){ + return R.data(CollUtil.newArrayList()); + } + //把list中所有元素的id放到一个List集合中 List idList= list.stream() .map(StatisticsBalanceAbnormalEntity::getId) @@ -118,13 +125,15 @@ public class StatisticsBalanceOrderInfoServiceImpl extends BaseServiceImpl> groupedPhotos = abnormalPhotoEntityList.stream() .collect(Collectors.groupingBy(StatisticsBalanceAbnormalPhotoEntity::getAbnormalId)); + List abnormalVOList = new ArrayList<>(); list.forEach(balanceAbnormalEntity -> { StatisticsBalanceAbnormalVO balanceAbnormalVO = new StatisticsBalanceAbnormalVO(); BeanUtil.copy(balanceAbnormalEntity,balanceAbnormalVO); balanceAbnormalVO.setAbnormalPhotoEntityList(groupedPhotos.get(balanceAbnormalEntity.getId())); + abnormalVOList.add(balanceAbnormalVO); }); - return R.data(list); + return R.data(abnormalVOList); } @Transactional(rollbackFor = Exception.class) @@ -189,6 +198,11 @@ public class StatisticsBalanceOrderInfoServiceImpl extends BaseServiceImpl list = balanceRecordService.list(balanceAbnormalEntityQueryWrapper); + + if(list.isEmpty()){ + return R.data(CollUtil.newArrayList()); + } + //把list中所有元素的id放到一个List集合中 List idList= list.stream() .map(StatisticsBalanceRecordEntity::getId) @@ -202,15 +216,17 @@ public class StatisticsBalanceOrderInfoServiceImpl extends BaseServiceImpl> groupedPhotos = recordPhotoEntityList.stream() .collect(Collectors.groupingBy(StatisticsBalanceRecordPhotoEntity::getRecordId)); + List balanceRecordVOS = new ArrayList<>(); list.forEach(balanceRecordEntity -> { StatisticsBalanceRecordVO balanceRecordVO = new StatisticsBalanceRecordVO(); BeanUtil.copy(balanceRecordEntity,balanceRecordVO); balanceRecordVO.setRecordPhotoEntityList(groupedPhotos.get(balanceRecordEntity.getId())); balanceRecordVO.setBalanceUserName(balanceRecordEntity.getBalanceUserName()); balanceRecordVO.setBalanceRemark(balanceRecordEntity.getBalanceRemark()); + balanceRecordVOS.add(balanceRecordVO); }); - return R.data(list); + return R.data(balanceRecordVOS); } @Override