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 8a38b4674..2df8b93f3 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 @@ -149,7 +149,7 @@ LEFT JOIN logpm_warehouse_updown_goods lwug ON ldpl.id = lwug.association_id LEFT JOIN logpm_warehouse_tray_goods lwtg ON ldpl.id = lwtg.association_id left join logpm_warehouse_warehouse lww on lww.id = ldpl.warehouse_id - LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.parce_list_id = ldpl.id + LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.parce_list_id = ldpl.id and ldrp.packet_bar_status = '1' LEFT JOIN logpm_distribution_reservation ldr on ldr.id = ldrp.reservation_id LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id = ldpl.id and ldl.type = 2 LEFT JOIN logpm_distribution_delivery_list lddl on lddl.id = ldl.delivery_id @@ -226,6 +226,12 @@ and ldpl.order_package_freeze_status = #{param.orderPackageFreezeStatus} + + and ldpl.order_package_loading_status = #{param.orderPackageLoadingStatus} + + + and ldpl.order_package_reservation_status = #{param.orderPackageReservationStatus} + and lwtg.tray_code = #{param.pallet}