From 0b528bf9f9a686365de30e48f873b28bc12c6a41 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 6 Sep 2024 16:20:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BE=85=E7=AD=BE=E6=94=B6=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/mapper/DistributionLoadscanMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml index 325dbd2d4..90b790ca1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml @@ -96,7 +96,7 @@ select waybill_no waybillNo, - sum(unload_num) num + sum(num) num from logpm_trunkline_cars_load_scan where load_id = #{loadId} and warehouse_id = #{nodeId} 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 e336c9879..2a771a1dd 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 @@ -7424,6 +7424,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadIdSet = groupedByLoadId.keySet(); + List trunklineCarsLoadEntities = baseMapper.selectBatchIds(loadIdSet); + //把trunklineCarsLoadEntities转化成以id为key的Map + Map map = trunklineCarsLoadEntities.stream().collect(Collectors.toMap(TrunklineCarsLoadEntity::getId, Function.identity())); + List updateParceListList = new ArrayList<>(); List updateStockArticleList = new ArrayList<>(); @@ -7454,6 +7458,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadScanEntityList2 = groupedByOrderCode.get(orderCode); if(CollUtil.isNotEmpty(loadScanEntityList2)){ + + TrunklineCarsLoadScanEntity carsLoadScanEntity = loadScanEntityList2.get(0); + Long loadId1 = carsLoadScanEntity.getLoadId(); + //把loadScanEntityList2的num进行累加 Integer num = loadScanEntityList2.stream().map(TrunklineCarsLoadScanEntity::getNum).reduce(0, Integer::sum); //把loadScanEntityList2中所有元素的scanCode放入一个List @@ -7483,9 +7491,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl Date: Wed, 25 Sep 2024 13:32:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E7=BB=93=E7=AE=97bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statistics/feign/IOrderInfoClient.java | 2 +- .../entity/TrunklineCarsLoadScanEntity.java | 12 +++++ .../warehouse/vo/FinanceWaybillExportVO.java | 12 ++--- .../logpm/warehouse/vo/FinanceWaybillVO.java | 13 ++--- .../mq/WaybillCancleCheckListener.java | 15 +++--- .../mapper/StatisticsOrderInfoMapper.xml | 50 ++++++++++--------- .../impl/StatisticsOrderInfoServiceImpl.java | 26 +++++----- .../vo/StatisticsPackageFeeInfoVO.java | 2 + .../controller/OpenOrderController.java | 2 +- .../service/impl/OpenOrderServiceImpl.java | 5 +- .../impl/TrunklineCarsLoadServiceImpl.java | 25 ++++++++++ .../warehouse/dto/WarehouseWaybillDTO.java | 6 +++ .../mapper/WarehouseWaybillMapper.xml | 33 +++++++++--- .../impl/WarehouseWaybillServiceImpl.java | 9 +++- 14 files changed, 144 insertions(+), 68 deletions(-) diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/feign/IOrderInfoClient.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/feign/IOrderInfoClient.java index b68114506..5a9a0e540 100644 --- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/feign/IOrderInfoClient.java +++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/feign/IOrderInfoClient.java @@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @FeignClient( - value = ModuleNameConstant.APPLICATION_BASICDATA_NAME + value = ModuleNameConstant.APPLICATION_STATISTICSDATA_NAME ) public interface IOrderInfoClient { diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadScanEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadScanEntity.java index ec1eb3a9f..e8ec3f7f3 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadScanEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadScanEntity.java @@ -142,4 +142,16 @@ public class TrunklineCarsLoadScanEntity extends TenantEntity { @ApiModelProperty(name = "卸车托盘编码",notes = "") private String unloadTrayCode; + /** 顾客名字 */ + @ApiModelProperty(name = "顾客名字",notes = "") + private String customerName; + + /** 顾客电话 */ + @ApiModelProperty(name = "顾客电话",notes = "") + private String customerTelephone; + + /** 顾客地址 */ + @ApiModelProperty(name = "顾客地址",notes = "") + private String customerAddress; + } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillExportVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillExportVO.java index dd2c2f5df..317b8b479 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillExportVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillExportVO.java @@ -187,17 +187,17 @@ public class FinanceWaybillExportVO implements Serializable { @ExcelProperty(value = "回扣") private BigDecimal rebate; @ExcelProperty(value = "品类数量") - private BigDecimal goodsTypeNum; + private String goodsTypeNum; @ExcelProperty(value = "品类开单运费") - private BigDecimal goodsTypePrice; + private String goodsTypePrice; @ExcelProperty(value = "品类系统配送单价") - private BigDecimal goodsTypeDeliveryPrice; + private String goodsTypeDeliveryPrice; @ExcelProperty(value = "品类系统提货单价") - private BigDecimal goodsTypePickupPrice; + private String goodsTypePickupPrice; @ExcelProperty(value = "品类系统运费单价") - private BigDecimal goodsTypeFreightPrice; + private String goodsTypeFreightPrice; @ExcelProperty(value = "品类数") - private BigDecimal goodsTypeCount; + private Integer goodsTypeCount; diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java index 9d805d508..3a8d2e43d 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java @@ -47,6 +47,7 @@ public class FinanceWaybillVO implements Serializable { private String cancleCheckUserName; private Date cancleCheckTime; private String waybillStatus; + private String waybillType; private Date openTime; private String goodsName; private Integer totalCount; @@ -75,12 +76,12 @@ public class FinanceWaybillVO implements Serializable { private BigDecimal claimingValue; private BigDecimal thirdOperationFee; private BigDecimal rebate; - private BigDecimal goodsTypeNum; - private BigDecimal goodsTypePrice; - private BigDecimal goodsTypeDeliveryPrice; - private BigDecimal goodsTypePickupPrice; - private BigDecimal goodsTypeFreightPrice; - private BigDecimal goodsTypeCount; + private String goodsTypeNum; + private String goodsTypePrice; + private String goodsTypeDeliveryPrice; + private String goodsTypePickupPrice; + private String goodsTypeFreightPrice; + private Integer goodsTypeCount; diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCancleCheckListener.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCancleCheckListener.java index e10fd4560..d796428fd 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCancleCheckListener.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCancleCheckListener.java @@ -1,5 +1,6 @@ package com.logpm.statistics.listener.mq; +import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.logpm.statistics.entity.StatisticsOrderInfoEntity; @@ -46,12 +47,14 @@ public class WaybillCancleCheckListener { //把orderInfoEntityList中所有元素的id放入一个集合 List orderInfoIdsList = orderInfoEntityList.stream().map(StatisticsOrderInfoEntity::getId).collect(Collectors.toList()); - //删除订单 - statisticsOrderInfoService.deleteListByOrderInfoIds(orderInfoIdsList); - //删除包件 - trunklinePackageService.deleteListByOrderInfoIds(orderInfoIdsList); - warehousePackageService.deleteListByOrderInfoIds(orderInfoIdsList); - distributionPackageService.deleteListByOrderInfoIds(orderInfoIdsList); + if(CollUtil.isNotEmpty(orderInfoIdsList)){ + //删除订单 + statisticsOrderInfoService.deleteListByOrderInfoIds(orderInfoIdsList); + //删除包件 + trunklinePackageService.deleteListByOrderInfoIds(orderInfoIdsList); + warehousePackageService.deleteListByOrderInfoIds(orderInfoIdsList); + distributionPackageService.deleteListByOrderInfoIds(orderInfoIdsList); + } log.info("#########cancleCheckWaybillIncomingData: 运单取消审核处理收入结算数据 结束 waybillId={}",waybillId); } diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml index 018fd8233..f5c30d11f 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml @@ -64,8 +64,8 @@ and Locate(#{param.waybillNo},lww.waybill_no) > 0 - - and Locate(#{param.orderNo},lww.order_code) > 0 + + and Locate(#{param.orderCode},lww.order_code) > 0 and Locate(#{param.shipper},lww.shipper) > 0 @@ -194,8 +194,8 @@ and Locate(#{param.waybillNo},lww.waybill_no) > 0 - - and Locate(#{param.orderNo},lww.order_code) > 0 + + and Locate(#{param.orderCode},lww.order_code) > 0 and Locate(#{param.shipper},lww.shipper) > 0 @@ -405,24 +405,24 @@ IFNULL(sum(lstp.num),0) totalNum, IFNULL(sum(lstp.weight),0) totalWeight, IFNULL(sum(lstp.volume),0) totalVolume, - IFNULL(sum(lstp.system_freight_price*lstp.num),0) systemFreightPrice, - IFNULL(sum(lstp.freight_price*lstp.num),0) freightPrice, - IFNULL(sum(lstp.system_pickup_price*lstp.num),0) systemPickupPrice, - IFNULL(sum(lstp.pickup_price*lstp.num),0) pickupPrice, - IFNULL(sum(lswp.warehuse_service_fee*lstp.num),0) warehouseServiceFee, - IFNULL(sum(lswp.warehouse_fee*lstp.num),0) warehouseFee, - IFNULL(sum(lswp.warehouse_manage_fee*lstp.num),0) warehouseManageFee, - IFNULL(sum(lswp.warehouse_sorting_fee*lstp.num),0) warehouseSortingFee, - IFNULL(sum(lswp.warehouse_operating_fee*lstp.num),0) warehouseOperatingFee, - IFNULL(sum(lsdp.system_delivery_fee*lstp.num),0) systemDeliveryFee, - IFNULL(sum(lsdp.delivery_service_fee*lstp.num),0) deliveryServiceFee, - IFNULL(sum(lsdp.delivery_fee*lstp.num),0) deliveryFee, - IFNULL(sum(lsdp.delivery_loading_fee*lstp.num),0) deliveryLoadingFee, - IFNULL(sum(lsdp.delivery_sorting_fee*lstp.num),0) deliverySortingFee, - IFNULL(sum(lsdp.delivery_upfloor_fee*lstp.num),0) deliveryUpfloorFee, - IFNULL(sum(lsdp.delivery_move_fee*lstp.num),0) deliveryMoveFee, - IFNULL(sum(lsdp.delivery_other_fee*lstp.num),0) deliveryOtherFee, - IFNULL(sum(lsdp.delivery_crossing_fee*lstp.num),0) deliveryCrossingFee + IFNULL(sum(lstp.system_freight_price),0) systemFreightPrice, + IFNULL(sum(lstp.freight_price),0) freightPrice, + IFNULL(sum(lstp.system_pickup_price),0) systemPickupPrice, + IFNULL(sum(lstp.pickup_price),0) pickupPrice, + IFNULL(sum(lswp.warehouse_service_fee),0) warehouseServiceFee, + IFNULL(sum(lswp.warehouse_fee),0) warehouseFee, + IFNULL(sum(lswp.warehouse_manage_fee),0) warehouseManageFee, + IFNULL(sum(lswp.warehouse_sorting_fee),0) warehouseSortingFee, + IFNULL(sum(lswp.warehouse_operating_fee),0) warehouseOperatingFee, + IFNULL(sum(lsdp.system_delivery_fee),0) systemDeliveryFee, + IFNULL(sum(lsdp.delivery_service_fee),0) deliveryServiceFee, + IFNULL(sum(lsdp.delivery_fee),0) deliveryFee, + IFNULL(sum(lsdp.delivery_loading_fee),0) deliveryLoadingFee, + IFNULL(sum(lsdp.delivery_sorting_fee),0) deliverySortingFee, + IFNULL(sum(lsdp.delivery_upfloor_fee),0) deliveryUpfloorFee, + IFNULL(sum(lsdp.delivery_move_fee),0) deliveryMoveFee, + IFNULL(sum(lsdp.delivery_other_fee),0) deliveryOtherFee, + IFNULL(sum(lsdp.delivery_crossing_fee),0) deliveryCrossingFee from logpm_statistics_trunkline_package lstp left join logpm_statistics_warehouse_package lswp on lswp.order_info_id = lstp.order_info_id and lswp.order_package_code = lstp.order_package_code and lswp.product_id = lstp.product_id left join logpm_statistics_distribution_package lsdp on lsdp.order_info_id = lswp.order_info_id and lsdp.order_package_code = lswp.order_package_code and lswp.product_id = lsdp.product_id @@ -438,11 +438,13 @@ IFNULL(sum(lstp.num),0) totalNum, IFNULL(sum(lstp.weight),0) totalWeight, IFNULL(sum(lstp.volume),0) totalVolume, + IFNULL(sum(lstp.system_freight_price),0)+IFNULL(sum(lstp.system_pickup_price),0)+IFNULL(sum(lswp.warehouse_service_fee),0)+IFNULL(sum(lsdp.delivery_service_fee),0) sysTotalFee, + IFNULL(sum(lstp.freight_price),0)+IFNULL(sum(lstp.pickup_price),0)+IFNULL(sum(lswp.warehouse_service_fee),0)+IFNULL(sum(lsdp.delivery_service_fee),0) totalFee, IFNULL(sum(lstp.system_freight_price),0) systemFreightPrice, IFNULL(sum(lstp.freight_price),0) freightPrice, IFNULL(sum(lstp.system_pickup_price),0) systemPickupPrice, IFNULL(sum(lstp.pickup_price),0) pickupPrice, - IFNULL(sum(lswp.warehuse_service_fee),0) warehouseServiceFee, + IFNULL(sum(lswp.warehouse_service_fee),0) warehouseServiceFee, IFNULL(sum(lswp.warehouse_fee),0) warehouseFee, IFNULL(sum(lswp.warehouse_manage_fee),0) warehouseManageFee, IFNULL(sum(lswp.warehouse_sorting_fee),0) warehouseSortingFee, @@ -479,7 +481,7 @@ @@ -725,8 +736,8 @@ and lww.urgency = #{param.urgency} - - and lww.transport_type = #{param.transportType} + + and lww.service_type = #{param.serviceType} and lww.transport_type = #{param.transportType} @@ -734,6 +745,10 @@ and lww.waybill_status = #{param.waybillStatus} + + + and IFNULL(lww.check_status,0) = #{param.checkStatus} + and lww.pickup_complete_or_not = #{param.pickupCompleteOrNot} @@ -752,6 +767,12 @@ and lww.create_time <= #{param.createTimeEndDate} + + and lww.check_time >= #{param.checkTimeStartDate} + + + and lww.check_time <= #{param.checkTimeEndDate} + and lww.Locate(#{param.agent},agent) > 0 @@ -791,7 +812,7 @@ and lww.freeze_time <= #{param.freezeTimeEndDate} - + GROUP BY lww.id order by lww.create_time desc diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index 42427e00b..4cec2fda6 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -833,6 +833,9 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl pageList = baseMapper.pageFinanceWaybillList(page, waybillDTO); // List records = pageList.getRecords(); // @@ -1116,9 +1119,11 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl list = baseMapper.financeWaybillListExport(waybillDTO); + waybillDTO.setCheckTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getCheckTimeStartStr())); + waybillDTO.setCheckTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getCheckTimeEndStr())); + List list = baseMapper.financeWaybillListExport(waybillDTO); - return Collections.emptyList(); + return list; } }