Browse Source

fix:删除自提备货列表的货物信息和托盘信息

visual
pref_mail@163.com 4 months ago
parent
commit
4d998cb371
  1. 15
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

15
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@ -259,15 +259,12 @@
lds.type_service typeService,
lds.outbound_date outboundDate,
lds.stockup_code stockupCode,
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
LEFT JOIN logpm_distribution_stockup_info ldsi ON ldsi.stockup_id = lds.id
LEFT JOIN logpm_distribution_reservation ldr ON ldsi.reservation_id = ldr.id
LEFT JOIN logpm_distribution_reservation_package ldrp ON ldrp.reservation_id = ldsi.reservation_id
LEFT JOIN logpm_distribution_parcel_list ldpl ON ldpl.id = ldrp.parce_list_id
<where>
lds.is_deleted = 0 AND ldsi.stock_status != 4
@ -356,14 +353,14 @@
lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time
fixTime,lds.assign_time assignTime,
lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,
COALESCE(GROUP_CONCAT(DISTINCT ldpl.goods_allocation SEPARATOR ','), '')stockipAllocation,
COALESCE(GROUP_CONCAT(DISTINCT ldpl.pallet SEPARATOR ','), '') pallet,
COALESCE(group_concat(DISTINCT ldsa.mall_name separator ','), '') as consignee
from logpm_distribution_stockup lds
LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id
LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldbs.bill_lading_id = ldsi.reservation_id
LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldbs.stock_article_id and ldbs.order_status in (1,2)
LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id
LEFT JOIN (
SELECT
@ -391,12 +388,6 @@
<if test="param.stockupUser != null and param.stockupUser != '' ">and lds.stockup_user like
concat('%',#{param.stockupUser},'%')
</if>
<if test="param.stockipAllocation != null and param.stockipAllocation != '' ">and ldpl.goods_allocation
like concat('%',#{param.stockipAllocation},'%')
</if>
<if test="param.pallet != null and param.pallet != '' ">and ldpl.pallet
like concat('%',#{param.pallet},'%')
</if>
<if test="param.stockupCode != null and param.stockupCode != '' ">and lds.stockup_code like
concat('%',#{param.stockupCode},'%')

Loading…
Cancel
Save