From f3f946f2040d8078c858d41b223028c78939b0d6 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 15 Jan 2025 17:23:59 +0800 Subject: [PATCH] =?UTF-8?q?1.bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/ExportWarehouseWaybillVO.java | 3 +++ .../AftersalesAbnormalRecordServiceImpl.java | 1 + .../logpm/report/mapper/ReportTimeMapper.xml | 16 ++++++------ .../controller/CarsLoadController.java | 8 ++++++ .../service/ITrunklineCarsLoadService.java | 1 + .../impl/CarsLoadAsyncServiceImpl.java | 5 +--- .../service/impl/OpenOrderServiceImpl.java | 5 ++++ .../impl/TrunklineAdvanceServiceImpl.java | 25 +++++++------------ ...ineCarsLoadLinePhotoEntityServiceImpl.java | 16 ++++++++---- .../impl/TrunklineCarsLoadServiceImpl.java | 19 +++++++++++--- .../mapper/WarehouseWaybillMapper.xml | 6 ++++- 11 files changed, 68 insertions(+), 37 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java index e44b1dc3e..438736f3a 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java @@ -125,6 +125,9 @@ public class ExportWarehouseWaybillVO implements Serializable { @ExcelProperty(value = "仓储操作费") private BigDecimal handlingFee; + @ExcelProperty(value = "安装费") + private BigDecimal installFee; + @ExcelProperty(value = "申明价值") private BigDecimal claimingValue; diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java index 73f1391bb..daf8dcbaa 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java @@ -503,6 +503,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl updateAdvanceDetailList = openOrderDTO.getUpdateAdvanceDetailList(); WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId); @@ -2986,6 +2989,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String updateMsg = verifyUpdateData(openOrderDTO, waybillEntity); + waybillEntity.setUpdateStatus(1); + warehouseWaybillClient.updateEntity(waybillEntity); if (CollUtil.isNotEmpty(updateAdvanceDetailList)) { diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index bc94ee765..631f6e4cd 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -13,11 +13,7 @@ import com.logpm.basicdata.entity.BasicdataBrandEntity; import com.logpm.basicdata.entity.BasicdataClientEntity; import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; -import com.logpm.basicdata.feign.IBasicdataBrandClient; -import com.logpm.basicdata.feign.IBasicdataClientClient; -import com.logpm.basicdata.feign.IBasicdataStoreBusinessClient; -import com.logpm.basicdata.feign.IBasicdataTripartiteMallClient; -import com.logpm.basicdata.feign.IBasicdataWarehouseClient; +import com.logpm.basicdata.feign.*; import com.logpm.distribution.dto.FindParamterDTO; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.entity.DistributionStockArticleEntity; @@ -31,8 +27,6 @@ import com.logpm.trunkline.entity.TrunklineAdvanceEntity; import com.logpm.trunkline.mapper.TrunklineAdvanceMapper; import com.logpm.trunkline.service.ITrunklineAdvanceDetailService; import com.logpm.trunkline.service.ITrunklineAdvanceService; -import com.logpm.trunkline.service.ITrunklineCarsLoadService; -import com.logpm.trunkline.service.ITrunklineDetailProductService; import com.logpm.trunkline.vo.CustomerInfoVO; import com.logpm.trunkline.vo.OpenOrderVO; import com.logpm.trunkline.vo.TrunklineAdvanceVO; @@ -51,14 +45,7 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -635,7 +622,13 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl= totalCount){ + waybillEntity.setStockCount(totalCount); + }else{ + waybillEntity.setStockCount(stockCount + 1); + } + } parcelList.setConditions(1); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLinePhotoEntityServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLinePhotoEntityServiceImpl.java index 07fe76776..487587a3d 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLinePhotoEntityServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLinePhotoEntityServiceImpl.java @@ -1,5 +1,6 @@ package com.logpm.trunkline.service.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.logpm.trunkline.entity.TrunklineCarsLoadLinePhotoEntity; import com.logpm.trunkline.mapper.TrunklineCarsLoadLinePhotoMapper; @@ -9,6 +10,7 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; @Service @@ -29,10 +31,14 @@ public class TrunklineCarsLoadLinePhotoEntityServiceImpl extends BaseServiceImpl @Override public List findListByLoadIdListAndWarehouseId(List idList, Long warehouseId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("load_id",idList) - .eq("warehouse_id",warehouseId); - List trunklineCarsLoadLinePhotoEntities = baseMapper.selectList(queryWrapper); - return trunklineCarsLoadLinePhotoEntities; + List ls = new ArrayList<>(); + if(CollUtil.isNotEmpty(idList)){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("load_id",idList) + .eq("warehouse_id",warehouseId); + ls = baseMapper.selectList(queryWrapper); + } + + return ls; } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 06d15d25a..d95e375b8 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -1527,9 +1527,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl