自提列表BUG修复

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

@@ -361,7 +361,7 @@
         ldpl.material_code
         ) AS t1 ON t.cargo_number = t1.material_code
         LEFT JOIN ( SELECT association_value, GROUP_CONCAT( DISTINCT ( allocation_id )) AS allocation_ids FROM
-        logpm_warehouse_updown_goods WHERE warehouse_id = #{warehouseId} AND association_type = 4 GROUP BY
+        logpm_warehouse_updown_goods WHERE warehouse_id = #{warehouseId} AND association_type = 4 AND market_name = #{mallName}  GROUP BY
         association_value ) AS t2 ON t.cargo_number = t2.association_value
         where ldslNew.is_deleted = 0
         AND ldslNew.warehouse_id=#{warehouseId}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -2357,14 +2357,14 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		if (Func.isNotEmpty(myCurrentWarehouse)) {
 			collect = new ArrayList<>();
 			collect.add(myCurrentWarehouse.getId());
-			 distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO, collect);
 
 		} else {
-			distrilbutionBillLadingVOIPage = baseMapper.getAllBillLadingByView(page, distrilbutionBillLadingDTO, collect);
+//			distrilbutionBillLadingVOIPage = baseMapper.getAllBillLadingByView(page, distrilbutionBillLadingDTO, collect);
 			collect = warehouseList.stream()
 				.map(BasicdataWarehouseEntity::getId)
 				.collect(Collectors.toList());
 		}
+		distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO, collect);
 
 
 		List<DistrilbutionBillLadingVO> records = distrilbutionBillLadingVOIPage.getRecords();