From 7483e4c255f654f42b2af9c92281be90902422e7 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 8 Jan 2025 17:12:14 +0800 Subject: [PATCH 01/10] =?UTF-8?q?feat(all):=20=E9=85=8D=E9=80=81=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改配送签收复核时间不准确问题 --- .../impl/DistributionSignforServiceImpl.java | 82 ++++++++++--------- 1 file changed, 45 insertions(+), 37 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 9d8426064..5c8a3d03b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -872,7 +872,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVOByStock(deliveryListEntity, pushList, OperatModeConstant.CLERK); + NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVOByStock(deliveryListEntity, pushList, OperatModeConstant.CLERK, signforTime); distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); } @@ -1354,6 +1355,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVOByZero(deliveryListEntity, pushList,OperatModeConstant.CLERK); + NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVOByZero(deliveryListEntity, pushList,OperatModeConstant.CLERK, signforTime); distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); @@ -2885,7 +2887,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity, distributionReservationEntity, pushList, OperatModeConstant.SCAN); + NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity, distributionReservationEntity, pushList, OperatModeConstant.SCAN, signforTime); distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); @@ -3206,7 +3208,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl buildDistributionSignforVOByStock(DistributionDeliveryListEntity distributionDeliveryListEntity, List pushList, String operatMode) { + private NodeFanoutMsg buildDistributionSignforVOByStock(DistributionDeliveryListEntity distributionDeliveryListEntity, + List pushList, String operatMode,Date signforTime) { NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg(); nodeFanoutMsg.setBizOperation(BizOperationEnums.ADD); @@ -3214,7 +3217,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl buildDistributionSignforVO(DistributionDeliveryListEntity distributionDeliveryListEntity, DistributionReservationEntity distributionReservationEntity, List pushList, String operatMode) { + private NodeFanoutMsg buildDistributionSignforVO(DistributionDeliveryListEntity distributionDeliveryListEntity, DistributionReservationEntity distributionReservationEntity, List pushList, String operatMode, Date signforTime) { NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg(); nodeFanoutMsg.setBizOperation(BizOperationEnums.ADD); @@ -3281,7 +3284,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity, distributionReservationEntity, pushDatas, OperatModeConstant.CLERK); + NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity, distributionReservationEntity, pushDatas, OperatModeConstant.CLERK, signforTime); distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); @@ -3788,6 +3792,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVO(distributionDeliveryListEntity, reservationEntity, pushList, OperatModeConstant.SCAN); + NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVO(distributionDeliveryListEntity, reservationEntity, pushList, OperatModeConstant.SCAN, signforTime); distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); return Resp.scanSuccess("操作成功", s); @@ -4310,6 +4315,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl distributionLoadscanEntities = distributionLoadscanMapper.selectList(new QueryWrapper().lambda() @@ -4366,7 +4372,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVOByStock(deliveryListEntity, pushList, OperatModeConstant.SCAN); + NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVOByStock(deliveryListEntity, pushList, OperatModeConstant.SCAN, signforTime); distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); @@ -6945,6 +6951,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVOByZero(deliveryListEntity, pushList, OperatModeConstant.SCAN); + NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVOByZero(deliveryListEntity, pushList, OperatModeConstant.SCAN, signforTime); distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); @@ -7192,7 +7199,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl buildDistributionSignforVOByZero(DistributionDeliveryListEntity distributionDeliveryListEntity, List pushList,String operatMode) { + private NodeFanoutMsg buildDistributionSignforVOByZero(DistributionDeliveryListEntity distributionDeliveryListEntity, List pushList,String operatMode, Date signforTime) { NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg(); nodeFanoutMsg.setBizOperation(BizOperationEnums.ADD); @@ -7200,7 +7207,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVOByStock(deliveryListEntity, pushInventoryList, OperatModeConstant.SCAN); + NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVOByStock(deliveryListEntity, pushInventoryList, OperatModeConstant.SCAN, signforTime); distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); } if (!pushList.isEmpty()) { // 构建新作业节点回传 - NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity, reservationEntity, pushList, OperatModeConstant.SCAN); + NodeFanoutMsg nodeFanoutMsg = buildDistributionSignforVO(deliveryListEntity, reservationEntity, pushList, OperatModeConstant.SCAN, signforTime); distributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser()); } if (!orderCodes.isEmpty()) { From c285b4aa766e6a287492cbbcd4a3b89a980e425d Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 8 Jan 2025 17:28:11 +0800 Subject: [PATCH 02/10] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrayAllocationConstants.java | 25 ++++++++ .../warehouse/AllocationInfoListener.java | 63 +++++++++++++++++++ .../receiver/warehouse/TrayInfoListener.java | 63 +++++++++++++++++++ .../DistributionParcelListServiceImpl.java | 36 ++++++++++- .../logpm/report/mapper/ReportTimeMapper.xml | 24 ++++--- .../impl/TrunklineCarsLoadServiceImpl.java | 13 ++-- 6 files changed, 209 insertions(+), 15 deletions(-) create mode 100644 blade-biz-common/src/main/java/org/springblade/common/constant/trayallocation/TrayAllocationConstants.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/warehouse/AllocationInfoListener.java create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/warehouse/TrayInfoListener.java diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/trayallocation/TrayAllocationConstants.java b/blade-biz-common/src/main/java/org/springblade/common/constant/trayallocation/TrayAllocationConstants.java new file mode 100644 index 000000000..ea3898809 --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/trayallocation/TrayAllocationConstants.java @@ -0,0 +1,25 @@ +package org.springblade.common.constant.trayallocation; + + +import org.springblade.common.constant.ModuleNameConstant; + +public class TrayAllocationConstants { + + + /** + * 清除包件上的托盘信息 + */ + public static final String WAREHOUSE_PRACL_CLEAR_TRAY_EXCHANGE = "warehouse.pracl.clear.tray.exchange" + ModuleNameConstant.DEVAUTH; + public static final String WAREHOUSE_PRACL_CLEAR_TRAY_QUEUE = "warehouse.pracl.clear.tray.queue" + ModuleNameConstant.DEVAUTH; + public static final String WAREHOUSE_PRACL_CLEAR_TRAY_ROUTINGKEY = "warehouse.pracl.clear.tray.key" + ModuleNameConstant.DEVAUTH; + + /** + * 清除包件上的库位信息 + */ + public static final String WAREHOUSE_PRACL_CLEAR_ALLOCATION_EXCHANGE = "warehouse.pracl.clear.allocation.exchange" + ModuleNameConstant.DEVAUTH; + public static final String WAREHOUSE_PRACL_CLEAR_ALLOCATION_QUEUE = "warehouse.pracl.clear.allocation.queue" + ModuleNameConstant.DEVAUTH; + public static final String WAREHOUSE_PRACL_CLEAR_ALLOCATION_ROUTINGKEY = "warehouse.pracl.clear.allocation.key" + ModuleNameConstant.DEVAUTH; + + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/warehouse/AllocationInfoListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/warehouse/AllocationInfoListener.java new file mode 100644 index 000000000..8215c82de --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/warehouse/AllocationInfoListener.java @@ -0,0 +1,63 @@ +package com.logpm.distribution.receiver.warehouse; + + +import cn.hutool.json.JSONUtil; +import com.logpm.distribution.mapper.DistributionParcelListMapper; +import com.rabbitmq.client.Channel; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.springblade.common.constant.trayallocation.TrayAllocationConstants; +import org.springframework.amqp.core.ExchangeTypes; +import org.springframework.amqp.rabbit.annotation.Exchange; +import org.springframework.amqp.rabbit.annotation.Queue; +import org.springframework.amqp.rabbit.annotation.QueueBinding; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.amqp.support.AmqpHeaders; +import org.springframework.messaging.handler.annotation.Header; +import org.springframework.stereotype.Component; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +@Slf4j +@Component +@AllArgsConstructor +public class AllocationInfoListener { + + private final DistributionParcelListMapper distributionParcelListMapper; + + @RabbitListener(bindings = @QueueBinding( + value = @Queue(name = TrayAllocationConstants.WAREHOUSE_PRACL_CLEAR_ALLOCATION_QUEUE, durable = "true"), + exchange = @Exchange(name = TrayAllocationConstants.WAREHOUSE_PRACL_CLEAR_ALLOCATION_EXCHANGE, type = ExchangeTypes.FANOUT) + ), ackMode = "MANUAL") + public void clearPraclAllocation(String msg, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long tag) { + + if(StringUtils.isNotBlank(msg)){ + + List ids = JSONUtil.toList(msg, Long.class); + //把ids每200个分组 + List> partitions = new ArrayList<>(); + for (int i = 0; i < ids.size(); i += 200) { + partitions.add(ids.subList(i, Math.min(i + 200, ids.size()))); + } + + partitions.forEach(clearTrayList -> { + log.info("############clearPraclAllocation: 当前处理的ids {}",clearTrayList); + + distributionParcelListMapper.clearAllocationByIds(clearTrayList); + }); + + }else{ + log.warn("#########clearPraclAllocation: 消息数据为空 msg={}",msg); + } + + try { + channel.basicAck(tag, false); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/warehouse/TrayInfoListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/warehouse/TrayInfoListener.java new file mode 100644 index 000000000..eed093827 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/warehouse/TrayInfoListener.java @@ -0,0 +1,63 @@ +package com.logpm.distribution.receiver.warehouse; + + +import cn.hutool.json.JSONUtil; +import com.logpm.distribution.mapper.DistributionParcelListMapper; +import com.rabbitmq.client.Channel; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.springblade.common.constant.trayallocation.TrayAllocationConstants; +import org.springframework.amqp.core.ExchangeTypes; +import org.springframework.amqp.rabbit.annotation.Exchange; +import org.springframework.amqp.rabbit.annotation.Queue; +import org.springframework.amqp.rabbit.annotation.QueueBinding; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.amqp.support.AmqpHeaders; +import org.springframework.messaging.handler.annotation.Header; +import org.springframework.stereotype.Component; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +@Slf4j +@Component +@AllArgsConstructor +public class TrayInfoListener { + + private final DistributionParcelListMapper distributionParcelListMapper; + + @RabbitListener(bindings = @QueueBinding( + value = @Queue(name = TrayAllocationConstants.WAREHOUSE_PRACL_CLEAR_TRAY_QUEUE, durable = "true"), + exchange = @Exchange(name = TrayAllocationConstants.WAREHOUSE_PRACL_CLEAR_TRAY_EXCHANGE, type = ExchangeTypes.FANOUT) + ), ackMode = "MANUAL") + public void clearPraclTray(String msg, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long tag) { + + if(StringUtils.isNotBlank(msg)){ + + List ids = JSONUtil.toList(msg, Long.class); + //把ids每200个分组 + List> partitions = new ArrayList<>(); + for (int i = 0; i < ids.size(); i += 200) { + partitions.add(ids.subList(i, Math.min(i + 200, ids.size()))); + } + + partitions.forEach(clearTrayList -> { + log.info("############clearPraclTray: 当前处理的ids {}",clearTrayList); + + distributionParcelListMapper.clearPalletByIds(clearTrayList); + }); + + }else{ + log.warn("#########clearPraclTray: 消息数据为空 msg={}",msg); + } + + try { + channel.basicAck(tag, false); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index 7b0df6a3e..dfb086c4d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -17,6 +17,7 @@ package com.logpm.distribution.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -40,6 +41,8 @@ import com.logpm.distribution.mapper.DistributionParcelListMapper; import com.logpm.distribution.mapper.DistributionStockArticleMapper; import com.logpm.distribution.service.*; import com.logpm.distribution.vo.*; +import com.logpm.factorydata.feign.IFactoryDataClient; +import com.logpm.factorydata.vo.SendMsg; import com.logpm.trunkline.feign.ITrunklineAdvanceDetailClient; import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient; import com.logpm.warehouse.entity.WarehouseConfigEntity; @@ -55,6 +58,7 @@ import org.springblade.common.constant.orderpackage.OrderPackageLoadingStatusCon import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant; import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant; import org.springblade.common.constant.reservation.ReservationPackageStatusConstant; +import org.springblade.common.constant.trayallocation.TrayAllocationConstants; import org.springblade.common.exception.CustomerException; import org.springblade.common.node.PackageNode; import org.springblade.common.utils.CommonUtil; @@ -78,6 +82,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.io.IOException; import java.util.*; import java.util.stream.Collectors; @@ -145,6 +150,9 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl selectDistributionParcelListPage(IPage page, DistributionParcelListVO distributionParcelList) { @@ -1332,7 +1340,18 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl clearTrayList) { - baseMapper.clearPalletByIds(clearTrayList); + try{ + baseMapper.clearPalletByIds(clearTrayList); + }catch (Exception e){ + log.error("清空包件托盘异常",e); + factoryDataClient.sendMessage(SendMsg.builder() + .exchange(TrayAllocationConstants.WAREHOUSE_PRACL_CLEAR_TRAY_EXCHANGE) + .routingKey(TrayAllocationConstants.WAREHOUSE_PRACL_CLEAR_TRAY_ROUTINGKEY) + .message(JSONUtil.toJsonStr(clearTrayList)) + .delay(10000) + .build()); + } + } @Override @@ -1342,7 +1361,20 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl clearTrayList) { - baseMapper.clearAllocationByIds(clearTrayList); + + try{ + baseMapper.clearAllocationByIds(clearTrayList); + }catch (Exception e){ + log.error("清空包件托盘异常",e); + factoryDataClient.sendMessage(SendMsg.builder() + .exchange(TrayAllocationConstants.WAREHOUSE_PRACL_CLEAR_ALLOCATION_EXCHANGE) + .routingKey(TrayAllocationConstants.WAREHOUSE_PRACL_CLEAR_ALLOCATION_ROUTINGKEY) + .message(JSONUtil.toJsonStr(clearTrayList)) + .delay(10000) + .build()); + } + + } @Override diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml index fe6929ba0..57e80d87d 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml @@ -1356,7 +1356,8 @@ lww.departure_warehouse_name departureWarehouseName, lww.destination_warehouse_name destinationWarehouseName, GROUP_CONCAT(DISTINCT ltad.train_number) trainNumber, - GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) loadCode, + GROUP_CONCAT(DISTINCT ltcls.load_code) loadingLoadCode, + GROUP_CONCAT(DISTINCT ltclsm.load_code) unloadLoadCode, count(ltad.id) totalNum, min(ltad.create_time) createTime, min(ldpls.create_time) startIncomingTime, @@ -1387,7 +1388,7 @@ left join logpm_trunkline_cars_load_scan ltclsm on ltclsm.scan_code = ldplm.order_package_code and ltclsm.unload_node_id = ldplm.warehouse_id left join logpm_trunkline_cars_load_line ltcllm on ltcllm.load_id = ltclsm.load_id and ltcllm.node_id = ltclsm.unload_node_id left join logpm_quality_deliver lqd on lqd.order_package_code = ltad.order_package_code and lqd.retention_time is null - left join logpm_reportconfig_order_all oat on oat.departure_warehouse_id = lww.departure_warehouse_id and oat.destination_warehouse_id = lww.destination_warehouse_id and oat.brand = lww.brand + left join logpm_reportconfig_order_all oat on oat.departure_warehouse_id = lww.departure_warehouse_id and oat.destination_warehouse_id = lww.destination_warehouse_id where ltad.waybill_id is not null and ltad.create_time > '2024-10-22 00:00:00' and lww.departure_warehouse_id != lww.destination_warehouse_id @@ -1454,8 +1455,11 @@ and GROUP_CONCAT(DISTINCT ltad.train_number) like concat('%',#{param.trainNumber},'%') - - and GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) like concat('%',#{param.loadCode},'%') + + and GROUP_CONCAT(DISTINCT ltcls.load_code) like concat('%',#{param.loadingLoadCode},'%') + + + and GROUP_CONCAT(DISTINCT ltclsm.load_code) like concat('%',#{param.unloadLoadCode},'%') @@ -1470,7 +1474,8 @@ lww.departure_warehouse_name departureWarehouseName, lww.destination_warehouse_name destinationWarehouseName, GROUP_CONCAT(DISTINCT ltad.train_number) trainNumber, - GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) loadCode, + GROUP_CONCAT(DISTINCT ltcls.load_code) loadingLoadCode, + GROUP_CONCAT(DISTINCT ltclsm.load_code) unloadLoadCode, count(ltad.id) totalNum, min(ltad.create_time) createTime, min(ldpls.create_time) startIncomingTime, @@ -1501,7 +1506,7 @@ left join logpm_trunkline_cars_load_scan ltclsm on ltclsm.scan_code = ldplm.order_package_code and ltclsm.unload_node_id = ldplm.warehouse_id left join logpm_trunkline_cars_load_line ltcllm on ltcllm.load_id = ltclsm.load_id and ltcllm.node_id = ltclsm.unload_node_id left join logpm_quality_deliver lqd on lqd.order_package_code = ltad.order_package_code and lqd.retention_time is null - left join logpm_reportconfig_order_all oat on oat.departure_warehouse_id = lww.departure_warehouse_id and oat.destination_warehouse_id = lww.destination_warehouse_id and oat.brand = lww.brand + left join logpm_reportconfig_order_all oat on oat.departure_warehouse_id = lww.departure_warehouse_id and oat.destination_warehouse_id = lww.destination_warehouse_id where ltad.waybill_id is not null and ltad.create_time > '2024-10-22 00:00:00' and lww.departure_warehouse_id != lww.destination_warehouse_id @@ -1568,8 +1573,11 @@ and GROUP_CONCAT(DISTINCT ltad.train_number) like concat('%',#{param.trainNumber},'%') - - and GROUP_CONCAT(DISTINCT IFNULL(ltcls.load_code,ltclsm.load_code)) like concat('%',#{param.loadCode},'%') + + and GROUP_CONCAT(DISTINCT ltcls.load_code) like concat('%',#{param.loadingLoadCode},'%') + + + and GROUP_CONCAT(DISTINCT ltclsm.load_code) like concat('%',#{param.unloadLoadCode},'%') 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 687a7fd47..c22259724 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 @@ -11707,14 +11707,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl Date: Wed, 8 Jan 2025 17:28:29 +0800 Subject: [PATCH 03/10] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/logpm/report/dto/ReportTimeDTO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportTimeDTO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportTimeDTO.java index 3fb02a2b7..cbc1181b1 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportTimeDTO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportTimeDTO.java @@ -39,6 +39,8 @@ public class ReportTimeDTO implements Serializable { private String destinationWarehouseName; private String trainNumber; private String loadCode; + private String loadingLoadCode; + private String unloadLoadCode; private String openTimeStartStr; From 7e3fa54253ef3e93e55963a05551941149a2f5f7 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 8 Jan 2025 18:51:45 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E4=B8=8B=E6=9E=B6=E8=A7=A3=E6=89=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 5c8a3d03b..c661db97d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -8173,10 +8173,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Wed, 8 Jan 2025 19:01:58 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E4=B8=8B=E6=9E=B6=E8=A7=A3=E6=89=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index c661db97d..1aee09310 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -8173,7 +8173,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Wed, 8 Jan 2025 19:06:25 +0800 Subject: [PATCH 06/10] =?UTF-8?q?1.=E7=AD=BE=E6=94=B6=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E4=B8=8B=E6=9E=B6=E8=A7=A3=E6=89=98=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 1aee09310..37174685c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -8173,7 +8173,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Wed, 8 Jan 2025 19:11:56 +0800 Subject: [PATCH 07/10] =?UTF-8?q?1.=E7=AD=BE=E6=94=B6=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E4=B8=8B=E6=9E=B6=E8=A7=A3=E6=89=98=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 37174685c..fd5b1563c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -8176,6 +8176,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Wed, 8 Jan 2025 20:07:27 +0800 Subject: [PATCH 08/10] =?UTF-8?q?1.=E8=A3=85=E8=BD=A6=E4=B8=8B=E6=9E=B6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9B=B4=E6=96=B0bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionDeliveryListServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 79e3114d9..32706b204 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 @@ -9319,8 +9319,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl Date: Thu, 9 Jan 2025 09:17:25 +0800 Subject: [PATCH 09/10] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/warehouse/mapper/TaskQuestMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml index c58ffb8b5..258d34c4d 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml @@ -91,7 +91,7 @@ `reserve3` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预留3', `reserve4` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预留4', `reserve5` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预留5', - `order_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单号', + `order_code` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '订单号', `quest_id` bigint(20) NULL DEFAULT NULL COMMENT '任务ID', `order_id` bigint(20) NULL DEFAULT NULL COMMENT '订单ID', `quest_type` int(11) NULL DEFAULT NULL COMMENT '盘点方式;1. 随机 2 库位3 订单 4 托盘', @@ -122,8 +122,8 @@ `third_product` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '三级品', `market_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商场名称（库存品）', `incoming_batch` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '批次号（库存品）', - `material_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物料名称(库存品)', - `waybill_number` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '运单号', + `material_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物料名称(库存品)', + `waybill_number` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '运单号', `send_warehouse_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发站仓名称', `tray_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '托盘名称', `brand_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '品牌名称', From 92558f62ff38b8328febd6c44d0fb8f4b8f4abf9 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 9 Jan 2025 11:45:32 +0800 Subject: [PATCH 10/10] =?UTF-8?q?1.=E9=9B=B6=E6=8B=85=E6=95=B4=E4=BD=93?= =?UTF-8?q?=E6=97=B6=E6=95=88=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/report/mapper/ReportTimeMapper.xml | 125 ++++++------------ .../vo/ReportPackgeAllTrunklineTimeVO.java | 3 + 2 files changed, 41 insertions(+), 87 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml index 57e80d87d..63c8ddc24 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml @@ -1112,6 +1112,7 @@ lww.departure_warehouse_name departureWarehouseName, lww.destination_warehouse_name destinationWarehouseName, lww.brand brand, + IFNULL(t.hours_time,#{param.hoursTime}) hoursTime, count(lww.id) waybillNum, sum(lww.total_count) openNum, sum(IFNULL(t.totalNum,0)) arriveNum, @@ -1138,28 +1139,29 @@ IFNULL(round(sum(IFNULL(t.sevenToTenNum,0))/sum(lww.total_count)*100,2),'0.00') sevenToTenArriveRate, sum(IFNULL(t.moreTenNum,0)) moreTenArriveNum, IFNULL(round(sum(IFNULL(t.moreTenNum,0))/sum(lww.total_count)*100,2),'0.00') moreTenArriveRate - from logpm_warehouse_waybill lww - left join logpm_warehouse_warehouse waw on waw.id = lww.departure_warehouse_id - left join (select ldpl.waybill_id, - sum(ldpn.quantity) totalNum, - sum(TIMESTAMPDIFF(SECOND,lw.create_time,ldpl.create_time )) timeSecond, - sum(if(ldpl.create_time <= DATE_ADD( lw.create_time, INTERVAL IFNULL(lrat.hours_time,0) HOUR ),ldpn.quantity,0)) onTimeNum, - sum(if(ldpl.create_time <= DATE_ADD( lw.create_time, INTERVAL 24 HOUR ),ldpn.quantity,0)) oneNum, - sum(if(DATE_ADD( lw.create_time, INTERVAL 24 HOUR )<ldpl.create_time and ldpl.create_time <= DATE_ADD( lw.create_time, INTERVAL 48 HOUR ),ldpn.quantity,0)) twoNum, - sum(if(DATE_ADD( lw.create_time, INTERVAL 48 HOUR )<ldpl.create_time and ldpl.create_time <= DATE_ADD( lw.create_time, INTERVAL 72 HOUR ),ldpn.quantity,0)) threeNum, - sum(if(DATE_ADD( lw.create_time, INTERVAL 72 HOUR )<ldpl.create_time and ldpl.create_time <= DATE_ADD( lw.create_time, INTERVAL 96 HOUR ),ldpn.quantity,0)) fourNum, - sum(if(DATE_ADD( lw.create_time, INTERVAL 96 HOUR )<ldpl.create_time and ldpl.create_time <= DATE_ADD( lw.create_time, INTERVAL 120 HOUR ),ldpn.quantity,0)) fiveNum, - sum(if(DATE_ADD( lw.create_time, INTERVAL 120 HOUR )<ldpl.create_time and ldpl.create_time <= DATE_ADD( lw.create_time, INTERVAL 144 HOUR ),ldpn.quantity,0)) sixNum, - sum(if(DATE_ADD( lw.create_time, INTERVAL 144 HOUR )<ldpl.create_time and ldpl.create_time <= DATE_ADD( lw.create_time, INTERVAL 168 HOUR ),ldpn.quantity,0)) sevenNum, - sum(if(DATE_ADD( lw.create_time, INTERVAL 168 HOUR )<ldpl.create_time and ldpl.create_time <= DATE_ADD( lw.create_time, INTERVAL 240 HOUR ),ldpn.quantity,0)) sevenToTenNum, - sum(if(DATE_ADD( lw.create_time, INTERVAL 240 HOUR )<ldpl.create_time,ldpn.quantity,0)) moreTenNum - from logpm_distribution_parcel_list ldpl - left join logpm_distribution_parcel_number ldpn on ldpn.parcel_list_id = ldpl.id - left join logpm_warehouse_waybill lw on lw.id = ldpl.waybill_id + from (select lw.id waybillId, + lrat.hours_time, + sum(ltcls.unload_num) totalNum, + sum(TIMESTAMPDIFF(SECOND,lw.create_time,ltcls.unload_time )) timeSecond, + sum(if(ltcls.unload_time <= DATE_ADD( lw.create_time, INTERVAL IFNULL(lrat.hours_time,#{param.hoursTime}) HOUR ),ltcls.unload_num,0)) onTimeNum, + sum(if(ltcls.unload_time <= DATE_ADD( lw.create_time, INTERVAL 24 HOUR ),ltcls.unload_num,0)) oneNum, + sum(if(DATE_ADD( lw.create_time, INTERVAL 24 HOUR )<ltcls.unload_time and ltcls.unload_time <= DATE_ADD( lw.create_time, INTERVAL 48 HOUR ),ltcls.unload_num,0)) twoNum, + sum(if(DATE_ADD( lw.create_time, INTERVAL 48 HOUR )<ltcls.unload_time and ltcls.unload_time <= DATE_ADD( lw.create_time, INTERVAL 72 HOUR ),ltcls.unload_num,0)) threeNum, + sum(if(DATE_ADD( lw.create_time, INTERVAL 72 HOUR )<ltcls.unload_time and ltcls.unload_time <= DATE_ADD( lw.create_time, INTERVAL 96 HOUR ),ltcls.unload_num,0)) fourNum, + sum(if(DATE_ADD( lw.create_time, INTERVAL 96 HOUR )<ltcls.unload_time and ltcls.unload_time <= DATE_ADD( lw.create_time, INTERVAL 120 HOUR ),ltcls.unload_num,0)) fiveNum, + sum(if(DATE_ADD( lw.create_time, INTERVAL 120 HOUR )<ltcls.unload_time and ltcls.unload_time <= DATE_ADD( lw.create_time, INTERVAL 144 HOUR ),ltcls.unload_num,0)) sixNum, + sum(if(DATE_ADD( lw.create_time, INTERVAL 144 HOUR )<ltcls.unload_time and ltcls.unload_time <= DATE_ADD( lw.create_time, INTERVAL 168 HOUR ),ltcls.unload_num,0)) sevenNum, + sum(if(DATE_ADD( lw.create_time, INTERVAL 168 HOUR )<ltcls.unload_time and ltcls.unload_time <= DATE_ADD( lw.create_time, INTERVAL 240 HOUR ),ltcls.unload_num,0)) sevenToTenNum, + sum(if(DATE_ADD( lw.create_time, INTERVAL 240 HOUR )<ltcls.unload_time,ltcls.unload_num,0)) moreTenNum + from logpm_trunkline_cars_load_scan ltcls + left join logpm_warehouse_waybill lw on lw.waybill_no = ltcls.waybill_no left join logpm_reportconfig_all_trunkline lrat on lrat.departure_warehouse_id = lw.departure_warehouse_id and lrat.destination_warehouse_id = lw.destination_warehouse_id and lrat.is_deleted=0 - where ldpl.conditions = 3 + where ltcls.type = 2 + and ltcls.scan_status = 2 + and ltcls.unload_check = 1 + and ltcls.unload_node_id = lw.destination_warehouse_id and lw.departure_warehouse_id != lw.destination_warehouse_id - and ldpl.create_time > '2024-10-22 00:00:00' + and lw.create_time > '2024-10-22 00:00:00' and lw.brand in @@ -1184,43 +1186,16 @@ and lw.create_time <= #{param.endTime} - and ldpl.warehouse_id = ldpl.accept_warehouse_id - and ldpl.warehouse_id != ldpl.send_warehouse_id - and ldpl.order_code = ldpl.waybill_number - -- and ldpl.waybill_id = 1853372208481284097 - group by ldpl.waybill_id) t on t.waybill_id = lww.id - where lww.waybill_type = 2 - and lww.departure_warehouse_id != lww.destination_warehouse_id + group by lw.id,lrat.hours_time) t + left join logpm_warehouse_waybill lww on lww.id = t.waybillId + left join logpm_warehouse_warehouse waw on waw.id = lww.departure_warehouse_id + where 1=1 and waw.business_line in #{item} - - and lww.brand in - - #{item} - - - - and lww.departure_warehouse_id in - - #{item} - - - - and lww.destination_warehouse_id in - - #{item} - - - - and lww.create_time >= #{param.startTime} - - - and lww.create_time <= #{param.endTime} - group by waw.business_line, lww.departure_warehouse_name, lww.destination_warehouse_name, @@ -1232,6 +1207,7 @@ lww.departure_warehouse_name departureWarehouseName, lww.destination_warehouse_name destinationWarehouseName, lww.brand brand, + IFNULL(t.hours_time,#{param.hoursTime}) hoursTime, count(lww.id) waybillNum, sum(lww.total_count) openNum, sum(IFNULL(t.totalNum,0)) arriveNum, @@ -1273,13 +1249,15 @@ sum(if(DATE_ADD( lw.create_time, INTERVAL 144 HOUR )<ldpl.create_time and ldpl.create_time <= DATE_ADD( lw.create_time, INTERVAL 168 HOUR ),ldpn.quantity,0)) sevenNum, sum(if(DATE_ADD( lw.create_time, INTERVAL 168 HOUR )<ldpl.create_time and ldpl.create_time <= DATE_ADD( lw.create_time, INTERVAL 240 HOUR ),ldpn.quantity,0)) sevenToTenNum, sum(if(DATE_ADD( lw.create_time, INTERVAL 240 HOUR )<ldpl.create_time,ldpn.quantity,0)) moreTenNum - from logpm_distribution_parcel_list ldpl - left join logpm_distribution_parcel_number ldpn on ldpn.parcel_list_id = ldpl.id - left join logpm_warehouse_waybill lw on lw.id = ldpl.waybill_id + from logpm_trunkline_cars_load_scan ltcls + left join logpm_warehouse_waybill lw on lw.waybill_no = ltcls.waybill_no left join logpm_reportconfig_all_trunkline lrat on lrat.departure_warehouse_id = lw.departure_warehouse_id and lrat.destination_warehouse_id = lw.destination_warehouse_id and lrat.is_deleted=0 - where ldpl.conditions = 3 + where ltcls.type = 2 + and ltcls.scan_status = 2 + and ltcls.unload_check = 1 + and ltcls.unload_node_id = lw.destination_warehouse_id and lw.departure_warehouse_id != lw.destination_warehouse_id - and ldpl.create_time > '2024-10-22 00:00:00' + and lw.create_time > '2024-10-22 00:00:00' and lw.brand in @@ -1304,43 +1282,16 @@ and lw.create_time <= #{param.endTime} - and ldpl.warehouse_id = ldpl.accept_warehouse_id - and ldpl.warehouse_id != ldpl.send_warehouse_id - and ldpl.order_code = ldpl.waybill_number - -- and ldpl.waybill_id = 1853372208481284097 - group by ldpl.waybill_id) t on t.waybill_id = lww.id - where lww.waybill_type = 2 - and lww.departure_warehouse_id != lww.destination_warehouse_id + group by lw.id,lrat.hours_time) t + left join logpm_warehouse_waybill lww on lww.id = t.waybillId + left join logpm_warehouse_warehouse waw on waw.id = lww.departure_warehouse_id + where 1=1 and waw.business_line in #{item} - - and lww.brand in - - #{item} - - - - and lww.departure_warehouse_id in - - #{item} - - - - and lww.destination_warehouse_id in - - #{item} - - - - and lww.create_time >= #{param.startTime} - - - and lww.create_time <= #{param.endTime} - group by waw.business_line, lww.departure_warehouse_name, lww.destination_warehouse_name, diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeAllTrunklineTimeVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeAllTrunklineTimeVO.java index fb9897c63..8e1472167 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeAllTrunklineTimeVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeAllTrunklineTimeVO.java @@ -17,6 +17,9 @@ public class ReportPackgeAllTrunklineTimeVO implements Serializable { @ExcelProperty(value = "品牌") private String brand; + @ExcelProperty(value = "标准时效") + private Integer hoursTime; + @ExcelProperty(value = "开单数") private Integer waybillNum; @ExcelProperty(value = "开单件数")