Merge branch 'pre-production'

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java

@@ -36,5 +36,5 @@ public interface ITrunklineAdvanceDetailClient {
 	 * @return
 	 */
 	@GetMapping(API_PREFIX+"/selectByOrderCodeAndWarehouseId")
-	List<TrunklineAdvanceDetailEntity> selectByOrderCodeAndWarehouseId(@RequestParam String orderCode,@RequestParam String warehouseIds);
+	List<TrunklineAdvanceDetailEntity> selectByOrderCodeAndWarehouseId(@RequestParam String orderCode);
 }

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

@@ -2837,10 +2837,11 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		List<Long> warehouseIdList = new ArrayList<>();
 		if (Objects.isNull(myCurrentWarehouse)){
 			//查询当前人的仓库列表
-			List<BasicdataWarehouseEntity> warehouseList = warehouseClient.getMyWarehouseList();
+//			List<BasicdataWarehouseEntity> warehouseList = warehouseClient.getMyWarehouseList();
-			if (!warehouseList.isEmpty()) {
+//			if (!warehouseList.isEmpty()) {
-				warehouseIdList.addAll(warehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()));
+//				warehouseIdList.addAll(warehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()));
-			}
+//			}
+			return R.fail("多仓库权限人员请选择仓库后查看");
 		}else {
 			warehouseIdList.add(myCurrentWarehouse.getId());
 		}
@@ -2849,7 +2850,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		}
 		Map<String,List<DistributionParcelListVO>> info = new HashMap<>();
 		//查询此暂存单数据在仓库的情况
-		List<TrunklineAdvanceDetailEntity> list = trunklineAdvanceDetailClient.selectByOrderCodeAndWarehouseId(orderCode,warehouseIdList.stream().map(String::valueOf).collect(Collectors.joining(",")));
+		List<TrunklineAdvanceDetailEntity> list = trunklineAdvanceDetailClient.selectByOrderCodeAndWarehouseId(orderCode);
 		if (!list.isEmpty()) {
 			List<String> orderPackageCodes = list.stream().map(TrunklineAdvanceDetailEntity::getOrderPackageCode).collect(Collectors.toList());
 		    info = handlePackageGroupByWarehouse(list,warehouseIdList,orderPackageCodes,Objects.isNull(myCurrentWarehouse),orderCode);
@@ -2866,7 +2867,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
 			.eq(DistributionParcelListEntity::getOrderCode, orderCode)
 			.in(DistributionParcelListEntity::getOrderPackageCode, orderPackageCodes)
-			.eq(DistributionParcelListEntity::getIsTransfer, 0)
+//			.eq(DistributionParcelListEntity::getIsTransfer, 0)
 			.in(!aNull,DistributionParcelListEntity::getWarehouseId,warehouseIdList)
 		);
 		if (!parcelListEntities.isEmpty()) {

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceDetailClient.java

@@ -45,10 +45,9 @@ public class TrunklineAdvanceDetailClient implements ITrunklineAdvanceDetailClie
 	}
 
 	@Override
-	public List<TrunklineAdvanceDetailEntity> selectByOrderCodeAndWarehouseId(String orderCode, String warehouseIds) {
+	public List<TrunklineAdvanceDetailEntity> selectByOrderCodeAndWarehouseId(String orderCode) {
 		return advanceDetailService.list(Wrappers.<TrunklineAdvanceDetailEntity>query().lambda()
 			.eq(TrunklineAdvanceDetailEntity::getOrderCode,orderCode)
-			.in(TrunklineAdvanceDetailEntity::getWarehouseId, Func.toLongList(warehouseIds))
 		);
 	}
 }