|
|
|
@ -841,12 +841,12 @@
|
|
|
|
|
group_concat(DISTINCT lwt.pallet_name) as trays, |
|
|
|
|
group_concat(DISTINCT lwug.position_code) as allocation |
|
|
|
|
from logpm_platform.logpm_distribution_stock_article ldsa |
|
|
|
|
left join logpm_platform.logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id and ldpl.tenant_id = '627683' |
|
|
|
|
left join logpm_platform.logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id |
|
|
|
|
left join logpm_platform.logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id |
|
|
|
|
left join logpm_platform.logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id |
|
|
|
|
left JOIN logpm_warehouse_tray lwt on lwtg.tray_id= lwt.id |
|
|
|
|
<where> |
|
|
|
|
ldsa.is_deleted = 0 and ldsa.order_status != '80' |
|
|
|
|
ldsa.is_deleted = 0 and ldsa.order_status IN ( 10, 20, 30, 40, 50, 60, 70 ) |
|
|
|
|
<if test="paramMap.warehouseId != null and paramMap.warehouseId != ''"> |
|
|
|
|
and ldsa.warehouse_id = #{paramMap.warehouseId} |
|
|
|
|
</if> |
|
|
|
@ -859,9 +859,7 @@
|
|
|
|
|
<if test="paramMap.trainNumber != null and paramMap.trainNumber != ''"> and ldsa.train_number = #{paramMap.trainNumber} </if> |
|
|
|
|
<if test="paramMap.acceptWarehouseName != null and paramMap.acceptWarehouseName != ''"> and ldsa.accept_warehouse_name = #{paramMap.acceptWarehouseName} </if> |
|
|
|
|
|
|
|
|
|
<if test="paramMap.tenantId != null and paramMap.tenantId != ''"> |
|
|
|
|
and ldsa.tenant_id = #{paramMap.tenantId} |
|
|
|
|
</if> |
|
|
|
|
|
|
|
|
|
<if test="paramMap.serviceNumber != null and paramMap.serviceNumber != ''"> |
|
|
|
|
and ldsa.servic_nNumber = #{paramMap.serviceNumber} |
|
|
|
|
</if> |
|
|
|
|