Merge branch 'dev' into pre-production

blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java

@@ -19,6 +19,9 @@ public class OldSystemDataPushConfig {
 		warehourseIds.add("124");
 		// 上海
 		warehourseIds.add("149");
+		// 遵义
+		//todo 老系统仓库ID
+		warehourseIds.add("33");
 	}
 
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java

@@ -246,6 +246,7 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 				basicdataDrivermiddleService.saveBatch(drivermiddleEntities);
 			}
 		}catch (Exception e){
+			log.error("车辆导入失败",e);
 			throw new RuntimeException("导入失败");
 		}
 

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

@@ -148,12 +148,19 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 	 * @return
 	 */
 	List<DistributionAppParcelListVO> selectListbyInpack(IPage<DistributionAppParcelListVO> page,@Param("param") DistributionAppDeliveryListDTO distributionDeliveryList);
+
 	/**
-	 * 查询签收列表
 	 *
+	 * @param page 分页参数
+	 * @param distributionAppDeliveryListDTO 查询条件
+	 * @param deliveryIds 司机ID集合
+	 * @param warehouseId  仓库ID集合
 	 * @return
 	 */
-    List<DistributionAppDeliveryListVO> selectDistributionAppDeliveryInListPage(IPage<DistributionAppDeliveryListVO> page,@Param("param")  DistributionAppDeliveryListDTO distributionAppDeliveryListDTO,@Param("array") List<Long> deliveryIds);
+    List<DistributionAppDeliveryListVO> selectDistributionAppDeliveryInListPage(IPage<DistributionAppDeliveryListVO> page,@Param("param")  DistributionAppDeliveryListDTO distributionAppDeliveryListDTO,@Param("array") List<Long> deliveryIds,@Param("warehouseIdList") List<Long> warehouseId);
+
+
+
 	/**
 	 * 客户查询库存品
 	 *

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

@@ -825,6 +825,15 @@
                             #{item}
                         </foreach>
                     </if>
+
+                    <if test="warehouseIdList != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(warehouseIdList)">
+                        and lddl.warehouse_id in
+                        <foreach collection="warehouseIdList" item="item" open="(" close=")" separator=",">
+                            #{item}
+                        </foreach>
+                    </if>
+
+
                     <if test="param.createTime_query!=null and param.createTime_query!=''">
                         and date_format(lddl.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
                     </if>

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

@@ -2915,12 +2915,18 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			}
 			List<Long> deliveryIds = distributionDeliverySelfMapper.selectdeliveryList(driverArtery.getId());
 			if (!deliveryIds.isEmpty()) {
-				distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryInListPage(page, distributionAppDeliveryListDTO, deliveryIds);
+				distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryInListPage(page, distributionAppDeliveryListDTO, deliveryIds,null);
 			} else {
 				return page.setRecords(distributionAppDeliveryListVOS);
 			}
 		} else {
-			distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryInListPage(page, distributionAppDeliveryListDTO, null);
+
+			/**
+			 * 获取当前账号能看到的仓库列表
+			 */
+			List<Long> warehouseIdList = getWarehouseIdList();
+
+			distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryInListPage(page, distributionAppDeliveryListDTO, null,warehouseIdList);
 		}
 
 
@@ -3074,6 +3080,25 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		return page.setRecords(distributionAppDeliveryListVOS);
 	}
 
+	@NotNull
+	private List<Long> getWarehouseIdList() {
+		List<Long> warehouseIdList = new ArrayList<>();
+		// 获取当前登陆人能操作的仓库
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+
+		if(Objects.isNull(myCurrentWarehouse)){
+			// 获取能操作的仓库列表
+			List<BasicdataWarehouseEntity> myWarehouseList = basicdataWarehouseClient.getMyWarehouseList();
+			for (BasicdataWarehouseEntity basicdataWarehouseEntity : myWarehouseList) {
+				warehouseIdList.add(basicdataWarehouseEntity.getId());
+			}
+
+		}else{
+			warehouseIdList.add(myCurrentWarehouse.getId());
+		}
+		return warehouseIdList;
+	}
+
 	@Override
 	public List<DistributionAppStockArticleVO> selectAppDeliveryInventory(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO) {
 		List<DistributionAppStockArticleVO> distributionAppStockArticleVOS = baseMapper.selectAppDeliveryInventoryPage(distributionAppDeliveryListDTO);