@ -2518,18 +2518,13 @@
FROM
logpm_distribution_delivery_list lddl
LEFT JOIN logpm_distribution_signfor lds ON lddl.id = lds.delivery_id
AND lds.tenant_id = '627683'
LEFT JOIN logpm_distribution_reservation_package ldrp ON ldrp.reservation_id = lds.reservation_id
AND ldrp.tenant_id = '627683'
LEFT JOIN logpm_distribution_parcel_list ldpl ON ldpl.id = ldrp.parce_list_id
AND ldpl.tenant_id = '627683'
LEFT JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldpl.stock_article_id
AND ldsa.tenant_id = '627683'
WHERE
lddl.id = #{deliveryId}
AND lddl.warehouse_id = #{warehouseId}
AND ldrp.packet_bar_status != 2
AND lddl.tenant_id = '627683'
</select>
<select id= "getBroadcastDataByStock" resultType= "java.util.Map" >
SELECT
@ -2543,22 +2538,16 @@
ldsld.num AS number,
ldsl.brand_name AS brandName,
lds.reservation_id as reservationId
FROM
logpm_distribution_delivery_list lddl
LEFT JOIN logpm_distribution_signfor lds ON lddl.id = lds.delivery_id
AND lds.tenant_id = '627683'
LEFT JOIN logpm_dis_stock_list_detail ldsld ON ldsld.reservation_id = lds.reservation_id
AND ldsld.tenant_id = '627683'
LEFT JOIN logpm_distribution_parcel_list ldpl ON ldpl.order_package_code = ldsld.stock_package_code
AND ldpl.tenant_id = '627683'
LEFT JOIN logpm_distribution_stock_list ldsl ON ldsl.id = ldsld.stock_list_id
AND ldsl.tenant_id = '627683'
WHERE
lddl.id = #{deliveryId}
AND lddl.warehouse_id = #{warehouseId}
AND ldsld.stock_package_status != 2
AND lddl.tenant_id = '627683'
</select>
<select id= "getBroadcastDataByZeroOrder" resultType= "java.util.Map" >
@ -2578,18 +2567,13 @@
FROM
logpm_distribution_delivery_list lddl
LEFT JOIN logpm_distribution_signfor lds ON lddl.id = lds.delivery_id
AND lds.tenant_id = '627683'
LEFT JOIN logpm_distribution_reservation_zero_package ldrzp ON ldrzp.reservation_id = lds.reservation_id
AND ldrzp.tenant_id = '627683'
LEFT JOIN logpm_distribution_parcel_list ldpl ON ldpl.id = ldrzp.parcel_list_id
AND ldpl.tenant_id = '627683'
LEFT JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldpl.stock_article_id
AND ldsa.tenant_id = '627683'
WHERE
lddl.id = #{deliveryId}
AND lddl.warehouse_id = #{warehouseId}
AND ldrzp.zero_package_status != 2
AND lddl.tenant_id = '627683'
</select>
<select id= "getBroadcastDataByZeroOrderAndParcId" resultType= "java.util.Map" >
@ -2608,19 +2592,14 @@
FROM
logpm_distribution_delivery_list lddl
LEFT JOIN logpm_distribution_signfor lds ON lddl.id = lds.delivery_id
AND lds.tenant_id = '627683'
LEFT JOIN logpm_distribution_reservation_zero_package ldrzp ON ldrzp.reservation_id = lds.reservation_id
AND ldrzp.tenant_id = '627683'
LEFT JOIN logpm_distribution_parcel_list ldpl ON ldpl.id = ldrzp.parcel_list_id
AND ldpl.tenant_id = '627683'
LEFT JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldpl.stock_article_id
AND ldsa.tenant_id = '627683'
WHERE
lddl.id = #{deliveryId}
AND lddl.warehouse_id = #{warehouseId}
AND ldrzp.parcel_list_id = #{parcelListId}
AND ldrzp.zero_package_status != 2
AND lddl.tenant_id = '627683'
</select>
<select id= "selectPackageByorderPackageCodeAndDeliveryId"