From dc5d13aa9849ec712e88ec99d0e2fa5fc5befe88 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 25 Oct 2024 15:36:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=A2=9E=E5=8A=A0=E5=8C=85?=
=?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=AD=97=E6=AE=B5=20=20=E5=AE=8C=E5=96=84?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../entity/AftersalesWorkOrderEntity.java | 7 ++
.../mapper/AftersalesWorkOrderMapper.xml | 76 +++++++++++++------
.../DistributionDeliveryListServiceImpl.java | 4 +-
3 files changed, 61 insertions(+), 26 deletions(-)
diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java
index f68ebac53..7832953a1 100644
--- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java
+++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java
@@ -277,6 +277,13 @@ public class AftersalesWorkOrderEntity extends TenantEntity {
@ApiModelProperty(value = "标识 1订单 2 零担 3库存品 ")
@TableField(exist = false)
private String identifying;
+
+ /**
+ * 标识 1订单 2 零担 3库存品
+ */
+ @ApiModelProperty(value = "标识 1订单 2 零担 3库存品 ")
+ @TableField(exist = false)
+ private String packageCode;
/**
* 处理仓库ID
*/
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
index 8787fa8e4..f6ba90a33 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
@@ -59,12 +59,13 @@
lawo.work_order_type,
lawo.discovery_node,
lawo.work_order_number,
- laap.waybill_number,
lawo.order_code,
lawo.train_number,
- GROUP_CONCAT(DISTINCT laap.`first` separator ',') as `first`,
- GROUP_CONCAT(DISTINCT laap.secondary separator ',') as secondary,
- group_concat( DISTINCT laap.brand_name SEPARATOR ',' ) AS brandName,
+ t.`first` AS `first`,
+ t.secondary AS secondary,
+ t.brand_name AS brandName,
+ t.waybill_number AS waybillNumber,
+ t.package_code AS packageCode,
lawo.vehicle_route,
lawo.deliver_goods_time,
lawo.discovery_time,
@@ -96,7 +97,21 @@
AND lap.conditions IN ( 1, 2 )
LEFT JOIN logpm_aftersales_completion_record lacr ON lacr.work_order_id = lawo.id
AND lacr.is_deleted = '0'
- left join logpm_aftersales_abnormal_package laap on lawo.id = laap.work_order_id
+ LEFT JOIN (SELECT
+ a.id,
+ group_concat( DISTINCT b.`first` SEPARATOR ',' ) AS `first`,
+ group_concat( DISTINCT b.secondary SEPARATOR ',' ) AS secondary,
+ group_concat( DISTINCT b.brand_name SEPARATOR ',' ) AS brand_name,
+ group_concat( DISTINCT b.package_code SEPARATOR ',' ) AS package_code,
+ group_concat( DISTINCT b.waybill_number SEPARATOR ',' ) AS waybill_number
+ FROM
+ logpm_aftersales_work_order AS a
+ LEFT JOIN logpm_aftersales_abnormal_package AS b ON a.id = b.work_order_id
+ WHERE
+ a.is_deleted = 0
+ AND b.is_deleted = 0
+ GROUP BY
+ a.id) AS t ON t.id = lawo.id
lawo.is_deleted = 0
and lawo.work_order_status = #{param.workOrderStatusNameS }
@@ -108,17 +123,13 @@
and lawo.waybill_number like concat('%', #{param.waybillNumber },'%')
and lawo.order_code like concat('%', #{param.orderCode },'%')
and lawo.train_number like concat('%', #{param.trainNumber },'%')
- and lawo.first like concat('%', #{param.first },'%')
- and lawo.secondary like concat('%', #{param.secondary },'%')
and lawo.vehicle_route like concat('%', #{param.vehicleRoute },'%')
- and lawo.brand_name like concat('%', #{param.brandName },'%')
and date_format(from_unixtime( lawo.deliver_goods_time),'%Y-%m-%d') = date_format(#{param.deliverGoodsTime },'%Y-%m-%d')
and date_format(from_unixtime(lawo.discovery_time),'%Y-%m-%d') = date_format( #{param.discoveryTime},'%Y-%m-%d')
and date_format(from_unixtime(lawo.warehousing_time),'%Y-%m-%d') = date_format( #{param.warehousingTime},'%Y-%m-%d')
and date_format(from_unixtime( lawo.delivery_time),'%Y-%m-%d') = date_format(#{param.deliveryTime} param.deliveryTime,'%Y-%m-%d')
and date_format(from_unixtime(lawo.audit_time),'%Y-%m-%d') = date_format(#{param.auditTime},'%Y-%m-%d')
and date_format(from_unixtime(lawo.entry_time),'%Y-%m-%d') = date_format(#{param.entryTime},'%Y-%m-%d')
-
and date_format(from_unixtime(lawo.over_time),'%Y-%m-%d') = date_format(#{param.overTime}),'%Y-%m-%d')
and lawo.waybill_mall like concat('%', #{param.waybillMall },'%')
and lawo.delivery_driver = #{param.deliveryDriver }
@@ -152,15 +163,15 @@
and lawo.work_order_type = #{param.workOrderType }
and lawo.discovery_node = #{param.discoveryNode }
and lawo.work_order_number like concat('%',#{param.workOrderNumber },'%')
- and lawo.waybill_number like concat('%', #{param.waybillNumber },'%')
- and lawo.order_code like concat('%', #{param.orderCode },'%')
and lawo.train_number like concat('%', #{param.trainNumber },'%')
- and lawo.first like concat('%', #{param.first },'%')
- and lawo.secondary like concat('%', #{param.secondary },'%')
and lawo.vehicle_route like concat('%', #{param.vehicleRoute },'%')
and lawo.work_order_status in ( #{param.workOrderStatus })
and lawo.work_order_status in ('10')
-
+ and t.first like concat('%',#{param.first},'%')
+ and t.secondary like concat('%',#{param.secondary},'%')
+ and t.brand_name like concat('%',#{param.brandName},'%')
+ and t.waybill_number like concat('%',#{param.waybillNumber},'%')
+ and t.package_code like concat('%',#{param.packageCode},'%')
group by lawo.id
ORDER BY lawo.create_time DESC
@@ -320,11 +331,8 @@
law.initiation_identification,
law.discovery_node,
law.work_order_number,
- law.waybill_number,
law.order_code,
law.train_number,
- laap.FIRST,
- laap.secondary,
law.vehicle_route,
law.deliver_goods_time,
law.discovery_time,
@@ -346,26 +354,41 @@
law.audit_time,
law.entry_time,
law.operator,
- laap.brand_name
+ t.`first` AS `first`,
+ t.secondary AS secondary,
+ t.brand_name AS brandName,
+ t.waybill_number AS waybillNumber,
+ t.package_code AS packageCode
FROM
logpm_aftersales_processor lap
LEFT JOIN logpm_aftersales_work_order law ON lap.work_order_id = law.id
- left join logpm_aftersales_abnormal_package laap on laap.work_order_id=law.id
+ LEFT JOIN (SELECT
+ a.id,
+ group_concat( DISTINCT b.`first` SEPARATOR ',' ) AS `first`,
+ group_concat( DISTINCT b.secondary SEPARATOR ',' ) AS secondary,
+ group_concat( DISTINCT b.brand_name SEPARATOR ',' ) AS brand_name,
+ group_concat( DISTINCT b.package_code SEPARATOR ',' ) AS package_code,
+ group_concat( DISTINCT b.waybill_number SEPARATOR ',' ) AS waybill_number
+ FROM
+ logpm_aftersales_work_order AS a
+ LEFT JOIN logpm_aftersales_abnormal_package AS b ON a.id = b.work_order_id
+ WHERE
+ a.is_deleted = 0
+ AND b.is_deleted = 0
+ GROUP BY
+ a.id) AS t ON t.id = law.id
lap.conditions != '3' and lap.is_deleted = 0 and law.id is not null and lap.processing_status in ('1','3') and lap.types_of = '2' and law.work_order_status in ('10','20','30')
and law.work_order_status = #{param.workOrderStatusNameS }
+ and law.operator = #{param.operator }
and law.work_order_status = #{param.workOrderStatus}
and lap.business_id = #{param.warehouseId}
and law.work_order_type = #{param.workOrderType}
and law.discovery_node = #{param.discoveryNode}
and law.work_order_number like concat('%',#{param.workOrderNumber},'%')
- and law.waybill_number like concat('%',#{param.waybillNumber},'%')
and law.order_code like concat('%',#{param.orderCode},'%')
- and laap.first like concat('%',#{param.first},'%')
- and laap.secondary like concat('%',#{param.secondary},'%')
and law.waybill_mall like concat('%',#{param.waybillMall},'%')
- and law.brand_name like concat('%',#{param.brandName},'%')
and law.customer_service_name like concat('%',#{param.customerServiceName},'%')
and law.delivery_driver like concat('%',#{param.deliveryDriver},'%')
and law.train_number like concat('%', #{param.trainNumber },'%')
@@ -380,7 +403,11 @@
and date_format(from_unixtime(law.audit_time),'%Y-%m-%d') = date_format(#{param.auditTime},'%Y-%m-%d')
and date_format(from_unixtime(law.entry_time),'%Y-%m-%d') = date_format(#{param.entryTime},'%Y-%m-%d')
and date_format(from_unixtime(law.over_time),'%Y-%m-%d') = date_format(#{param.overTime}),'%Y-%m-%d')
- and laap.brand_name like concat('%',#{param.brandName},'%')
+ and t.first like concat('%',#{param.first},'%')
+ and t.secondary like concat('%',#{param.secondary},'%')
+ and t.brand_name like concat('%',#{param.brandName},'%')
+ and t.waybill_number like concat('%',#{param.waybillNumber},'%')
+ and t.package_code like concat('%',#{param.packageCode},'%')
@@ -477,7 +504,6 @@
left join logpm_aftersales_abnormal_package laap on laap.work_order_id=lawo.id
LEFT JOIN `logpm_distribution_parcel_list` `ldpl` ON `ldpl`.`order_package_code` = `laap`.`package_code`
LEFT JOIN `logpm_distribution_stock_article` `ldsa` ON `ldsa`.`id` = `ldpl`.`stock_article_id`
-
LEFT JOIN `logpm_aftersales_processing_results` `lapr` ON `lapr`.`work_order_id` = `lap`.`work_order_id`
LEFT JOIN `logpm_aftersales_completion_record` `lacr` ON `lacr`.`work_order_id` = `lapr`.`work_order_id`
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 4ece47f3c..2c735d7f1 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
@@ -4681,7 +4681,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl parcelListVOIPage = new ArrayList<>();
- List loadscanEntities = distributionLoadscanMapper.selectList(Wrappers.query().lambda().eq(DistributionLoadscanEntity::getDeliveryId, deliveryId).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
+ List loadscanEntities = distributionLoadscanMapper.selectList(Wrappers.query().lambda()
+ .eq(DistributionLoadscanEntity::getDeliveryId, deliveryId)
+ .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
Map loadingDataMap = null;
if (Func.isNotEmpty(loadscanEntities)) {
loadingDataMap = loadscanEntities.stream().collect(Collectors.toMap(DistributionLoadscanEntity::getPackageId, Function.identity(), (k1, k2) -> k2));