From c00df97d3954b7ce6ccc83f858470fd9645a5f99 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080> Date: Thu, 11 Jan 2024 23:28:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90=E7=AD=BE?= =?UTF-8?q?=E6=94=B6=E5=9B=BE=E7=89=87=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/DistrilbutionBillLadingVO.java | 1 + .../vo/DistrilbutionBillLadingViewVO.java | 6 ++++- ...ftersalesProcessingResultsServiceImpl.java | 26 ++++++++++++++++--- .../impl/AftersalesWorkOrderServiceImpl.java | 4 ++- .../DistrilbutionBillLadingController.java | 1 + .../DistrilbutionBillLadingServiceImpl.java | 25 +++++++++++++++--- 6 files changed, 55 insertions(+), 8 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java index a181e0d9f..cd6a3ee95 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingVO.java @@ -71,6 +71,7 @@ public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity { private Integer signedFor ; //已签收 private Integer stopNum; //实提件数 private Integer sumTotal; //总数 + private Boolean printState; //是否上传图片 @ApiModelProperty(value = "提货状态") private String conditionName; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingViewVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingViewVO.java index 560a80cb8..52022c1c5 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingViewVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingViewVO.java @@ -1,7 +1,10 @@ package com.logpm.distribution.vo; +import com.logpm.distribution.entity.DistributionPrintEntity; import lombok.Data; +import java.util.List; + /** * @program: LogisticsPlatform-Service * @description: @@ -17,6 +20,7 @@ public class DistrilbutionBillLadingViewVO { private String consigneeUnit; private String customerName; private String customerTelephone; - + //图片集合 + private List printList; } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessingResultsServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessingResultsServiceImpl.java index 45fa61046..b36448f8d 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessingResultsServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesProcessingResultsServiceImpl.java @@ -86,7 +86,9 @@ public class AftersalesProcessingResultsServiceImpl extends BaseServiceImpl{ + if(ObjectUtil.isNotNull(i.getId()) ){ + //修改 + AftersalesProcessingMoneyEntity processingMoneyEntity = new AftersalesProcessingMoneyEntity(); + BeanUtil.copyProperties(i,processingMoneyEntity); + aftersalesProcessingMoneyService.updateById(processingMoneyEntity); + }else{ + //新增 + AftersalesProcessingMoneyEntity processingMoneyEntity = new AftersalesProcessingMoneyEntity(); + BeanUtil.copyProperties(i,processingMoneyEntity); + processingMoneyEntity.setProcessingResultsId( aftersalesProcessingResults.getId()); + aftersalesProcessingMoneyService.save(processingMoneyEntity); + } + }); + } + + + } + return true; } /** 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 92951afbb..646c8d2da 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 @@ -1435,7 +1435,9 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl{ i.setTypeServiceName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, i.getTypeService())); i.setCertificateTypeName(DictBizCache.getValue(DictBizConstant.CERTIFICATE_TYPE, i.getCertificateType())); + //查询图片数据 // 遍历BillLadingStatusConstant的所有枚举值 Arrays.stream(BillLadingStatusConstant.values()) .filter(ii -> i.getConditions().equals(ii.getValue())) // 根据条件过滤 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 50ee1cb92..0551f82b0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -858,13 +858,24 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO); List records = distrilbutionBillLadingVOIPage.getRecords(); - records.forEach(i -> { List list = distributionDeliveryChargeService.list(Wrappers.query().lambda() .eq(DistributionDeliveryChargeEntity::getBillLading, i.getId()) ); list.forEach(ii -> ii.setCostName(DictBizCache.getValue(DictBizConstant.DELIVERY_COST, ii.getCost()))); i.setList(list); + //查询是不是上传图片 + List list1 = distributionPrintService.list(Wrappers.query().lambda() + .eq(DistributionPrintEntity::getBillLadingId, i.getId()) + ); + int count = (int) list1.stream().filter(ii -> "1".equals(ii.getGenre().toString())).count(); + int count1 = (int) list1.stream().filter(ii -> "2".equals(ii.getGenre().toString())).count(); + int count2 = (int) list1.stream().filter(ii -> "3".equals(ii.getGenre().toString())).count(); + if(count1 >= 1 && count >= 1 && count2 >= 1){ + i.setPrintState(true); + }else{ + i.setPrintState(false); + } }); distrilbutionBillLadingVOIPage.setRecords(records); return distrilbutionBillLadingVOIPage; @@ -1821,8 +1832,16 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl getViewDetailOwn(String id) { - - return baseMapper.getViewDetailOwn(id); + List viewDetailOwn = baseMapper.getViewDetailOwn(id); + viewDetailOwn.forEach(i ->{ + List list = distributionPrintService.list(Wrappers.query().lambda() + .eq(DistributionPrintEntity::getBillLadingId, id) + ); + if(!viewDetailOwn.isEmpty()){ + i.setPrintList(list); + } + }); + return viewDetailOwn; } @Transactional(rollbackFor = Exception.class)