diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index c2ab45616..c11b12534 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -259,20 +259,8 @@ lds.type_service typeService, lds.outbound_date outboundDate, lds.stockup_code stockupCode, - GROUP_CONCAT(( - SELECT - group_concat( DISTINCT pallet ) - FROM - logpm_distribution_parcel_list - WHERE - id IN ( SELECT parce_list_id FROM logpm_distribution_reservation_package WHERE reservation_id = ldr.id AND packet_bar_status != 2 ))) AS pallet, - GROUP_CONCAT(( - SELECT - group_concat( DISTINCT goods_allocation ) - FROM - logpm_distribution_parcel_list - WHERE - id IN ( SELECT parce_list_id FROM logpm_distribution_reservation_package WHERE reservation_id = ldr.id AND packet_bar_status != 2 ))) AS stockipAllocation, + COALESCE ( group_concat( DISTINCT ldpl.goods_allocation SEPARATOR ',' ), '' ) AS stockipAllocation, + COALESCE ( group_concat( DISTINCT ldpl.pallet SEPARATOR ',' ), '' ) AS pallet, COALESCE ( group_concat( DISTINCT ldr.consignee SEPARATOR ',' ), '' ) AS consignee FROM logpm_distribution_stockup lds