diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index df0506b05..be84bce3c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -638,12 +638,9 @@ ldpl.dealer_name, ldpl.dealer_code, ldpl.send_warehouse_id, ldpl.send_warehouse_name, ldpl.accept_warehouse_id, ldpl.accept_warehouse_name, ldpl.order_package_delivery_status, - GROUP_CONCAT(DISTINCT lwt.pallet_name) pallet, - GROUP_CONCAT(DISTINCT lwug.position_code) goodsAllocation + ldpl.pallet pallet, + ldpl.goods_allocation goodsAllocation From logpm_distribution_parcel_list ldpl - LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id - LEFT JOIN logpm_warehouse_tray lwt on lwtg.tray_id = lwt.id - LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id ldpl.conditions in ('1','3') and ldpl.service_number like @@ -685,10 +682,10 @@ and ldpl.order_package_code like concat('%',#{param.orderPackageCode},'%') - and lwtg.tray_code like + and ldpl.pallet like concat('%',#{param.pallet},'%') - and lwug.position_code like + and ldpl.goods_allocation like concat('%',#{param.goodsAllocation},'%') and ldpl.firsts like @@ -726,7 +723,6 @@ and ldpl.conditions = #{param.conditions} - GROUP BY ldpl.id