diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index b5df4d2ba..e5187fbaf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -387,6 +387,7 @@ LEFT JOIN logpm_warehouse_updown_goods lwug on ldsi.material_id = lwug.association_id and ldsi.incoming_batch = lwug.incoming_batch and ldsi.market_id = lwug.market_id and lwug.association_type = '4' and lwug.warehouse_id = ldsi.warehouse_id + lwug.id is not null and ldsi.material_id = #{param.materialId} and ldsi.market_id = #{param.marketId} and ldsi.warehouse_id = #{param.warehouseId} @@ -414,6 +415,7 @@ AND ldsi.market_id = ldsli.market_id and ldsli.incoming_batch = ldsi.incoming_batch LEFT JOIN logpm_warehouse_updown_goods lwug ON ldsli.parcel_list_id = lwug.association_id and lwug.association_type = '3' + lwug.id is not null and ldsi.id = #{param.id} group by lwug.allocation_id diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index dbf42eb3a..4a693961a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -89,7 +89,7 @@ and dsa.consignee_unit like concat('%',#{param.consigneeUnit},'%') - and dsa.customer_name like + and dbl.customer_name like concat('%',#{param.customerName},'%') and dsa.customer_telephone like