add:增加商家多客户支持

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java

@@ -20,6 +20,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.logpm.basicdata.entity.BasicdataClientEntity;
 import com.logpm.basicdata.entity.BasicdataClientUserEntity;
 import com.logpm.basicdata.vo.BasicdataClientVO;
+import org.springblade.common.annotations.ChangeAsync;
 import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -108,4 +109,14 @@ public interface IBasicdataClientClient {
 	 */
 	@GetMapping(API_PREFIX+"/findEntityByIds")
 	List<BasicdataClientEntity> findEntityByIds(@RequestParam List<Long> clientIds);
+
+
+	/**
+	 * 查询制定租户下面的客户结合
+	 * @param tenantId
+	 * @return
+	 */
+	@GetMapping(API_PREFIX+"/findBasicdataClientEntitysTenantId")
+	List<BasicdataClientEntity> findBasicdataClientEntitysTenantId(@RequestParam String tenantId) ;
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/aspect/ChangeAsyncAnnotationAspect.java

@@ -0,0 +1,122 @@
+package com.logpm.basicdata.aspect;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springblade.common.annotations.ChangeAsync;
+import org.springblade.common.cache.CacheNames;
+import org.springblade.common.component.MockLoginService;
+import org.springblade.core.redis.cache.BladeRedis;
+import org.springblade.core.redis.lock.LockType;
+import org.springblade.core.redis.lock.RedisLockClient;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.core.tool.utils.ThreadLocalUtil;
+import org.springframework.core.annotation.Order;
+import org.springframework.core.env.Environment;
+import org.springframework.http.HttpHeaders;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import java.lang.reflect.Method;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+@Aspect
+@Component
+@Slf4j
+@Order(-1)
+@AllArgsConstructor
+public class ChangeAsyncAnnotationAspect {
+
+	private final MockLoginService mockLoginService;
+
+	private final BladeRedis bladeRedis;
+	private final Environment environment;
+	private final RedisLockClient redisLockClient;
+	private final String account = "shujutongbu";
+
+	/**
+	 * 定义一个切点，匹配所有带有@ChangeAsync注解的方法。
+	 * 注意：实际上Spring Framework自带对@ChangeAsync的处理，直接这样配置可能会导致预期之外的行为。
+	 */
+	@Around("@annotation(org.springblade.common.annotations.ChangeAsync)")
+	public Object logAroundAsyncMethods(ProceedingJoinPoint joinPoint) throws Throwable {
+
+		MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+		Method method = signature.getMethod();
+
+		ChangeAsync myAsync = method.getAnnotation(ChangeAsync.class);
+		String annotationValue = myAsync.value();
+		log.info(">>>>>>>>>>>>>>>>>> ChangeAsync={}", annotationValue);
+
+		// 获取当前拦截方法的入参参数
+		Object[] args = joinPoint.getArgs();
+		// 获取入参名称
+		String[] parameterNames = signature.getParameterNames();
+		String tenantId = null;
+		// 获取参数名称 为tenantId 的值
+		for (int i = 0; i < parameterNames.length; i++) {
+			if ("tenantId".equals(parameterNames[i])) {
+				tenantId = (String) args[i];
+				log.info(">>  tenandId {} ", tenantId);
+				break;
+			}
+		}
+		// 执行模拟登录
+		if (StringUtil.isNotBlank(tenantId)) {
+			String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account;
+			String lockKey =key+":lock";
+			JSONObject data =bladeRedis.get(key);
+			if(Objects.isNull(data)){
+				boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS);
+				if(flag){
+					data =bladeRedis.get(key);
+					if(Objects.isNull(data)){
+						data = mockLoginService.mockToken(tenantId,account);
+						bladeRedis.setEx(key,data,2591990L);
+						redisLockClient.unLock(lockKey, LockType.FAIR);
+					}
+				}
+			}
+
+			MockHttpServletRequest mockRequest = new MockHttpServletRequest();
+			mockRequest.addHeader("Blade-Auth", "bearer "+data.get("access_token"));
+			RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(mockRequest));
+
+			HttpHeaders httpHeaders = new HttpHeaders();
+			httpHeaders.add("Blade-Auth","bearer "+data.get("access_token") );
+			httpHeaders.add(	"Authorization", "Basic bG9jYWw6bG9jYWxfc2VjcmV0");
+			ThreadLocalUtil.put("bladeContext", httpHeaders);
+
+			DynamicDataSourceContextHolder.push(data.getString("tenant_id"));
+			// 执行原方法
+			Object result = joinPoint.proceed();
+			// 在方法执行后，从数据源上下文中移除租户ID
+			DynamicDataSourceContextHolder.poll();
+			return result;
+		}else{
+			return joinPoint.proceed();
+		}
+
+
+//			// 在方法执行前的操作
+//			String tenantId = AuthUtil.getTenantId();
+//			log.info(">>  tenandId {} ",tenantId);
+//			DynamicDataSourceContextHolder.push("627683");
+//
+//			// 执行原方法
+//			Object result = joinPoint.proceed();
+//
+//			// 在方法执行后的操作
+//			DynamicDataSourceContextHolder.poll();
+//			return result;
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java

@@ -190,7 +190,7 @@ public class BasicdataDriverArteryController extends BladeController {
 			.eq(BasicdataDriverArteryEntity::getUserId, basicdataDriverArtery.getUserId())
 			.eq(BasicdataDriverArteryEntity::getIsDeleted, 0)
 		);
-		if (list.size() > 0) {
+		if (!list.isEmpty()) {
 			return R.fail("绑定的用户已存在！不要重复绑定！！！");
 		}
 		String phone = basicdataDriverArtery.getPhone();

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java

@@ -17,6 +17,7 @@
 package com.logpm.basicdata.feign;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -27,7 +28,9 @@ import com.logpm.basicdata.entity.BasicdataClientUserEntity;
 import com.logpm.basicdata.service.IBasicdataClientService;
 import com.logpm.basicdata.service.IBasicdataClientUserService;
 import com.logpm.basicdata.vo.BasicdataClientVO;
+import com.logpm.distribution.entity.DistributionParcelListEntity;
 import lombok.AllArgsConstructor;
+import org.springblade.common.annotations.ChangeAsync;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -141,4 +144,11 @@ public class BasicdataClientClient implements IBasicdataClientClient {
 		return basicdataClientService.listByIds(clientIds);
 	}
 
+	@ChangeAsync
+	@Override
+	public List<BasicdataClientEntity> findBasicdataClientEntitysTenantId(String tenantId) {
+		LambdaQueryWrapper<BasicdataClientEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(BasicdataClientEntity::getIsDeleted, 0);// 查询未删除的客户信息
+		return basicdataClientService.list(lambdaQueryWrapper);
+	}
 }

blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessAsyncServiceImpl.java

@@ -26,7 +26,6 @@ public class BusinessAsyncServiceImpl implements IBusinessAsyncService {
 
 	private final IBusinessPreOrderService businessPreOrderService;
 	private final ISysClient sysClient;
-	private final IDistributionDeliveryListClient distributionDeliveryListClient;
 
 	@ChangeAsync()
 	@Override
@@ -35,9 +34,9 @@ public class BusinessAsyncServiceImpl implements IBusinessAsyncService {
 		List<String> orderCodeList = dataResult.stream()
 			.map(BusinessPreOrderEntity::getOrderCode)
 			.collect(Collectors.toList());
-		R<Tenant> tenantByName = sysClient.getTenantByName(mallName);
-		if (tenantByName.isSuccess()) {
-			Tenant tenant = tenantByName.getData();
+		R<Tenant> tenant1 = sysClient.getTenant(tenantId);
+		if (tenant1.isSuccess()) {
+			Tenant tenant = tenant1.getData();
 			if (ObjectUtil.isEmpty(tenant)) {
 				log.info(">>>>>>>>>>>>> saveOtherDataBaseNew 租户不存在");
 				return;
@@ -46,10 +45,6 @@ public class BusinessAsyncServiceImpl implements IBusinessAsyncService {
 				log.info(" saveOtherDataBaseNew dataResult 参数错误");
 			}
 
-
-
-
-
 			LambdaQueryWrapper<BusinessPreOrderEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 			lambdaQueryWrapper.eq(BusinessPreOrderEntity::getInWarehouse, 0);
 			lambdaQueryWrapper.in(BusinessPreOrderEntity::getOrderCode, orderCodeList);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java

@@ -1,6 +1,8 @@
 package com.logpm.distribution.receiver;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.logpm.basicdata.entity.BasicdataClientEntity;
+import com.logpm.basicdata.feign.IBasicdataClientClient;
 import com.logpm.business.entity.BusinessPreOrderEntity;
 import com.logpm.business.feign.IBusinessPreOrderClient;
 import com.logpm.distribution.entity.*;
@@ -24,7 +26,7 @@ import org.springframework.stereotype.Component;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -42,6 +44,7 @@ public class BusinessPreOrderDataQueueHandler {
 	private final IBusinessPreOrderClient businessPreOrderClient;
 	private final IExtractedDataClient extractedDataClient;
 	private final IDistributionLoadscanService distributionLoadscanService;
+	private final IBasicdataClientClient basicdataClientClient;
 
 
 	private final IDistributionAsyncService distributionAsyncService;
@@ -50,21 +53,146 @@ public class BusinessPreOrderDataQueueHandler {
 	public void businessPreOrderDataHandler(Map map, Message message, Channel channel) {
 //		plantA(map);
 		R<List<Tenant>> tenantList = sysClient.getTenantList();
+
 		if (tenantList.isSuccess()) {
 			List<Tenant> data = tenantList.getData();
 			data.forEach(tenant -> {
 				if (!ObjectUtil.isEmpty(tenant.getTenantType())) {
 					if (2 == tenant.getTenantType()) {
-						String mallName = tenant.getTenantName();
-						// 插入暂存单
-						// 插入预计表
-						plantA(map, mallName);
+						List<BasicdataClientEntity> basicdataClientEntitysTenantId = basicdataClientClient.findBasicdataClientEntitysTenantId(tenant.getTenantId());
+						if (!basicdataClientEntitysTenantId.isEmpty()) {
+								// 寻找当前配送计划下的预约单
+								Long t = (Long) map.get("messageData");
+								if (ObjectUtil.isEmpty(t)) {
+									log.info(">>>>>>>>>>>>> BusinessPreOrderDataQueueHandler 配送ID为空");
+									return;
+								}
+								DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListService.getById(t);
+								if (ObjectUtil.isEmpty(distributionDeliveryListEntity)) {
+									log.info(">>>>>>>>>>>>> BusinessPreOrderDataQueueHandler 配送对象为null");
+									return;
+								}
+								List<DistributionReservationEntity> list = distributionReservationService.selectListByDeliveryId(distributionDeliveryListEntity.getId());
+								if (list != null && !list.isEmpty()) {
+									resoveData(tenant,distributionDeliveryListEntity, basicdataClientEntitysTenantId, list);
+								}
+
+						}
 					}
 				}
 			});
 		}
+
+
+
 	}
 
+	private void resoveData(Tenant te,DistributionDeliveryListEntity distributionDeliveryListEntity, List<BasicdataClientEntity> allClientList, List<DistributionReservationEntity> allDistributionReservationEntity) {
+
+		for (DistributionReservationEntity distributionReservationEntity : allDistributionReservationEntity) {
+			BasicdataClientEntity basicdataClient = checkAllClientList(allClientList, distributionReservationEntity);
+
+			if (basicdataClient != null) {
+				List<BusinessPreOrderEntity> dataResult = new ArrayList<>();
+				String mallName = basicdataClient.getClientName();
+				// 判断需要进行推送商家名称
+				log.info(">>>>> mallName TAG {}", mallName);
+				log.info(">>>>> distributionReservationEntity.getMallName() TAG {}", distributionReservationEntity.getMallName());
+				if (mallName.equals(distributionReservationEntity.getMallName())) {
+
+					// 将当前的预约单加入到需要推送的列表
+					LambdaQueryWrapper<DistributionReservationPackageEntity> queryWrapper = new LambdaQueryWrapper<>();
+					queryWrapper.eq(DistributionReservationPackageEntity::getReservationId, distributionReservationEntity.getId());
+					queryWrapper.ne(DistributionReservationPackageEntity::getPacketBarStatus, 2);
+					List<DistributionReservationPackageEntity> distributionReservationPackageEntityList = distributionReservationPackageService.list(queryWrapper);
+
+					for (DistributionReservationPackageEntity distributionReservationPackageEntity : distributionReservationPackageEntityList) {
+
+
+						DistributionParcelListEntity byId = distributionParcelListService.getById(distributionReservationPackageEntity.getParceListId());
+						BusinessPreOrderEntity data = BeanUtil.copy(byId, BusinessPreOrderEntity.class);
+
+						// 判断包件是否装车
+						if ("20".equals(byId.getOrderPackageLoadingStatus())) {
+							data.setLoadNum(1);
+						}
+						data.setDriverName(distributionDeliveryListEntity.getDriverName());
+						data.setVehicleName(distributionDeliveryListEntity.getVehicleName());
+						data.setDistrCarNumber(distributionDeliveryListEntity.getTrainNumber());
+						data.setFromTenantId(byId.getTenantId());
+						data.setOperationStatus(0);
+						data.setInWarehouse(0);
+						data.setId(null);
+						data.setTenantId(null);
+						data.setReservationCode(distributionReservationEntity.getReservationCode());
+						data.setTaskTime(distributionDeliveryListEntity.getTaskTime());
+						dataResult.add(data);
+					}
+
+					// 零担数据
+
+					LambdaQueryWrapper<DistributionReservationZeroPackageEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+					lambdaQueryWrapper.eq(DistributionReservationZeroPackageEntity::getReservationId, distributionReservationEntity.getId());
+					lambdaQueryWrapper.ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, 2);
+					List<DistributionReservationZeroPackageEntity> list1 = distributionReservationZeroPackageService.list(lambdaQueryWrapper);
+					for (DistributionReservationZeroPackageEntity distributionReservationZeroPackageEntity : list1) {
+						// 查询包间
+						DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(distributionReservationZeroPackageEntity.getParcelListId());
+						if (parcelListEntity != null) {
+							BusinessPreOrderEntity data = BeanUtil.copy(parcelListEntity, BusinessPreOrderEntity.class);
+							// 计划数量
+							data.setQuantity(distributionReservationZeroPackageEntity.getQuantity());
+
+							// 获取装车数量
+							DistributionLoadscanEntity distributionLoadscanEntity = distributionLoadscanService.findLoadDataByRelationIdAndParcelListId(distributionReservationZeroPackageEntity.getReservationId(), distributionReservationZeroPackageEntity.getParcelListId());
+							if (distributionLoadscanEntity != null) {
+								//设置装车数量
+								data.setLoadNum(distributionLoadscanEntity.getLoadedNub());
+							}
+							data.setConditions(3);
+							data.setDriverName(distributionDeliveryListEntity.getDriverName());
+							data.setVehicleName(distributionDeliveryListEntity.getVehicleName());
+							data.setDistrCarNumber(distributionDeliveryListEntity.getTrainNumber());
+							data.setFromTenantId(parcelListEntity.getTenantId());
+							data.setOperationStatus(0);
+							data.setInWarehouse(0);
+							data.setId(null);
+							data.setTenantId(null);
+							data.setReservationCode(distributionReservationEntity.getReservationCode());
+							data.setTaskTime(distributionDeliveryListEntity.getTaskTime());
+							dataResult.add(data);
+						}
+
+					}
+				}
+				// 处理暂存但的数据
+
+				// 获取运单号集合
+				List<String> waybillNumberList = dataResult.stream().map(BusinessPreOrderEntity::getWaybillNumber).distinct().collect(Collectors.toList());
+				// 发送数据
+//				Tenant tenant = changeDataBase(mallName);
+				waybillNumberList.forEach(waybillNumber -> extractedDataClient.execute(te.getTenantId(), waybillNumber));
+
+				businessPreOrderClient.saveOtherDataBaseNew(te.getTenantId(), dataResult, mallName);
+			}
+
+		}
+	}
+
+	private BasicdataClientEntity checkAllClientList(List<BasicdataClientEntity> allClientList, DistributionReservationEntity distributionReservationEntity) {
+
+		for (BasicdataClientEntity basicdataClient : allClientList) {
+
+			if (basicdataClient.getClientName().equals(distributionReservationEntity.getMallName())) {
+				return basicdataClient;
+			}
+
+		}
+		return null;
+	}
+
+
+
 
 	private void plantA(Map map, String mallName) {
 
@@ -142,7 +270,7 @@ public class BusinessPreOrderDataQueueHandler {
 
 						// 获取装车数量
 						DistributionLoadscanEntity distributionLoadscanEntity = distributionLoadscanService.findLoadDataByRelationIdAndParcelListId(distributionReservationZeroPackageEntity.getReservationId(), distributionReservationZeroPackageEntity.getParcelListId());
-						if(distributionLoadscanEntity != null){
+						if (distributionLoadscanEntity != null) {
 							//设置装车数量
 							data.setLoadNum(distributionLoadscanEntity.getLoadedNub());
 						}

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

@@ -4692,131 +4692,136 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 	@Override
 	public R loadingStart(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
-		String method = "#########################DistributionStockArticleController.loadingStart";
-		if (Objects.isNull(distrilbutionloadingscanDTO.getDeliveryId())) {
-			log.error(method + "参数缺失DeliveryId()");
-			return Resp.fail("参数缺失,请联系管理员");
-		}
-		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
-		if (Objects.isNull(myCurrentWarehouse)) {
-			return R.fail(403, "未授权!!!");
-		}
-		WarehouseConfigEntity warehouseConfigEntity = warehouseConfigClient.getWarehouseConfig(myCurrentWarehouse.getId());
-		Integer isStrictLoading = 0;
-		if (!Objects.isNull(warehouseConfigEntity)) {
-			if (!Objects.isNull(warehouseConfigEntity.getIsStrictLoading())) {
-				isStrictLoading = warehouseConfigEntity.getIsStrictLoading();
+		StringBuilder builder = null;
+		try {
+			String method = "#########################DistributionStockArticleController.loadingStart";
+			if (Objects.isNull(distrilbutionloadingscanDTO.getDeliveryId())) {
+				log.error(method + "参数缺失DeliveryId()");
+				return Resp.fail("参数缺失,请联系管理员");
 			}
-		}
-		BladeUser user = AuthUtil.getUser();
-		//获取当前用户司机
-		DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
-		if (DeliveryStatusConstant.yiwancheng.getValue().equals(distributionDeliveryListEntity.getDeliveryStatus())) {
-			return Resp.scanFail("该任务已完结！", "该任务已完结!");
-		}
-		if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == distributionDeliveryListEntity.getIsStart()) {
-			return Resp.scanFail("该车次已发车！", "该车次已发车!");
-		}
-		Boolean isDriverFlag = judgeIsDriver(user);
-		if (Objects.equals(distributionDeliveryListEntity.getKind(), "1")) {
-			if (!isDriverFlag) {
-				return Resp.scanFail("当前操作人必须是司机！", "当前操作人必须是司机!");
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if (Objects.isNull(myCurrentWarehouse)) {
+				return R.fail(403, "未授权!!!");
 			}
-		}
-		//统计该配送任务的库存品装车数
-		Integer abnormalPackageLoadingNum = distributionLoadscanMapper.statisticsAbnormalLoadingNum(distrilbutionloadingscanDTO.getDeliveryId());
-		if (abnormalPackageLoadingNum != 0) {
-			return Resp.scanFail("存在异常请处理", "存在异常请处理");
-		}
-		String format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date());
-		String loadingId = distrilbutionloadingscanDTO.getLoadingId();
-		Boolean b = false;
-		Boolean isEnd = false;
-		//防止司机进行重复发车点击
-		Long isRepeat = bladeRedis.get(AuthUtil.getTenantId() + ":warehouseId:" + myCurrentWarehouse.getId() + ":trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + ":driverId:");
+			WarehouseConfigEntity warehouseConfigEntity = warehouseConfigClient.getWarehouseConfig(myCurrentWarehouse.getId());
+			Integer isStrictLoading = 0;
+			if (!Objects.isNull(warehouseConfigEntity)) {
+				if (!Objects.isNull(warehouseConfigEntity.getIsStrictLoading())) {
+					isStrictLoading = warehouseConfigEntity.getIsStrictLoading();
+				}
+			}
+			BladeUser user = AuthUtil.getUser();
+			//获取当前用户司机
+			DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
+			if (DeliveryStatusConstant.yiwancheng.getValue().equals(distributionDeliveryListEntity.getDeliveryStatus())) {
+				return Resp.scanFail("该任务已完结！", "该任务已完结!");
+			}
+			if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == distributionDeliveryListEntity.getIsStart()) {
+				return Resp.scanFail("该车次已发车！", "该车次已发车!");
+			}
+			Boolean isDriverFlag = judgeIsDriver(user);
+			if (Objects.equals(distributionDeliveryListEntity.getKind(), "1")) {
+				if (!isDriverFlag) {
+					return Resp.scanFail("当前操作人必须是司机！", "当前操作人必须是司机!");
+				}
+			}
+			//统计该配送任务的库存品装车数
+			Integer abnormalPackageLoadingNum = distributionLoadscanMapper.statisticsAbnormalLoadingNum(distrilbutionloadingscanDTO.getDeliveryId());
+			if (abnormalPackageLoadingNum != 0) {
+				return Resp.scanFail("存在异常请处理", "存在异常请处理");
+			}
+			String format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date());
+			String loadingId = distrilbutionloadingscanDTO.getLoadingId();
+			Boolean b = false;
+			Boolean isEnd = false;
+			//防止司机进行重复发车点击
+			Long isRepeat = bladeRedis.get(AuthUtil.getTenantId() + ":warehouseId:" + myCurrentWarehouse.getId() + ":trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + ":driverId:");
 
-		if ("1".equals(distributionDeliveryListEntity.getKind())) {
+			if ("1".equals(distributionDeliveryListEntity.getKind())) {
 
-			DistributionDeliverySelfEntity distributionDeliverySelfEntity = getDriver(distributionDeliveryListEntity, user, distrilbutionloadingscanDTO.getVehicleNub(), isDriverFlag);
-			distributionDeliverySelfEntity.setDepartureTime(format);
-			b = distributionDeliverySelfService.updateById(distributionDeliverySelfEntity);
-			isEnd = isEndDriver(distributionDeliveryListEntity.getId());
-			if (Func.isNotEmpty(isRepeat)) {
-				if (distributionDeliverySelfEntity.getDriverId().equals(isRepeat)) {
-					return Resp.scanFail("请勿重复发车", "请勿重复发车");
+				DistributionDeliverySelfEntity distributionDeliverySelfEntity = getDriver(distributionDeliveryListEntity, user, distrilbutionloadingscanDTO.getVehicleNub(), isDriverFlag);
+				distributionDeliverySelfEntity.setDepartureTime(format);
+				b = distributionDeliverySelfService.updateById(distributionDeliverySelfEntity);
+				isEnd = isEndDriver(distributionDeliveryListEntity.getId());
+				if (Func.isNotEmpty(isRepeat)) {
+					if (distributionDeliverySelfEntity.getDriverId().equals(isRepeat)) {
+						return Resp.scanFail("请勿重复发车", "请勿重复发车");
+					}
 				}
-			}
 
-		} else {
-			b = distributionDeliveryTripartiteService.update(new UpdateWrapper<DistributionDeliveryTripartiteEntity>().lambda()
-				.eq(DistributionDeliveryTripartiteEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
-				.set(DistributionDeliveryTripartiteEntity::getDepartureTime, format));
-			isEnd = true;
-		}
-		//处理最后一个司机进行发车
-		//判断是否是最后一个司机点发车
-		distributionDeliveryListEntity.setIsStart(DeliveryStartStatusConstant.bufenfache.getValue());
-		if (isEnd) {
-			distributionDeliveryListEntity.setIsStart(DeliveryStartStatusConstant.yifache.getValue());
-			//进行实际装车和计划数据比对
-			if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isStrictLoading) {
-				contrastPlanAndLoading(distributionDeliveryListEntity, myCurrentWarehouse);
-			}
-			//进行发车日志记录
-		}
-		bladeRedis.setEx(AuthUtil.getTenantId() + ":warehouseId:" + myCurrentWarehouse.getId() + ":trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + ":driverId:", user.getUserId(), 60L * 30L);
-		//修改主表状态
-		distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.peisongzhong.getValue());
-		baseMapper.updateById(distributionDeliveryListEntity);
-		//查询配送计划的所有预约总数
-		List<DistributionReservationEntity> reservationEntityList = distributionDeliveryListMapper.selectReservationByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId());
+			} else {
+				b = distributionDeliveryTripartiteService.update(new UpdateWrapper<DistributionDeliveryTripartiteEntity>().lambda()
+					.eq(DistributionDeliveryTripartiteEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
+					.set(DistributionDeliveryTripartiteEntity::getDepartureTime, format));
+				isEnd = true;
+			}
+			//处理最后一个司机进行发车
+			//判断是否是最后一个司机点发车
+			distributionDeliveryListEntity.setIsStart(DeliveryStartStatusConstant.bufenfache.getValue());
+			if (isEnd) {
+				distributionDeliveryListEntity.setIsStart(DeliveryStartStatusConstant.yifache.getValue());
+				//进行实际装车和计划数据比对
+				if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isStrictLoading) {
+					contrastPlanAndLoading(distributionDeliveryListEntity, myCurrentWarehouse);
+				}
+				//进行发车日志记录
+			}
+			bladeRedis.setEx(AuthUtil.getTenantId() + ":warehouseId:" + myCurrentWarehouse.getId() + ":trainNumber:" + distributionDeliveryListEntity.getTrainNumber() + ":driverId:", user.getUserId(), 60L * 30L);
+			//修改主表状态
+			distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.peisongzhong.getValue());
+			baseMapper.updateById(distributionDeliveryListEntity);
+			//查询配送计划的所有预约总数
+			List<DistributionReservationEntity> reservationEntityList = distributionDeliveryListMapper.selectReservationByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId());
 //		reservationEntityList.stream().collect(Collectors.reducing(0,DistributionReservationEntity::getReservationNum,Integer::sum));
-		StringBuilder builder = new StringBuilder();
-		AtomicInteger planCount = new AtomicInteger();
-		reservationEntityList.forEach(r -> {
-			planCount.getAndAdd(r.getReservationNum() + r.getReservationStockListNum());
-		});
-		if (planCount.get() != 0) {
-			builder.append("计划" + planCount.get() + "件");
-		}
-		Integer loadingCount = new Integer(0);
-		//查询配送任务的计划订单装车数
-		Integer packageLoadingNum = distributionLoadscanMapper.statisticsLoadingNum(distrilbutionloadingscanDTO.getDeliveryId());
-		if (packageLoadingNum != 0) {
-			loadingCount += packageLoadingNum;
-		}
-		Integer inventoryLoadingNum = 0;
-		if (distributionDeliveryListEntity.getType().equals(DistributionTypeConstant.shipie.getValue())) {
-			inventoryLoadingNum = distributionLoadscaninvnMapper.statisticsLoadingNum(distrilbutionloadingscanDTO.getDeliveryId());
-			if (inventoryLoadingNum != 0) {
-				loadingCount += inventoryLoadingNum;
+			builder = new StringBuilder();
+			AtomicInteger planCount = new AtomicInteger();
+			reservationEntityList.forEach(r -> {
+				planCount.getAndAdd(r.getReservationNum() + r.getReservationStockListNum());
+			});
+			if (planCount.get() != 0) {
+				builder.append("计划" + planCount.get() + "件");
+			}
+			Integer loadingCount = new Integer(0);
+			//查询配送任务的计划订单装车数
+			Integer packageLoadingNum = distributionLoadscanMapper.statisticsLoadingNum(distrilbutionloadingscanDTO.getDeliveryId());
+			if (packageLoadingNum != 0) {
+				loadingCount += packageLoadingNum;
+			}
+			Integer inventoryLoadingNum = 0;
+			if (distributionDeliveryListEntity.getType().equals(DistributionTypeConstant.shipie.getValue())) {
+				inventoryLoadingNum = distributionLoadscaninvnMapper.statisticsLoadingNum(distrilbutionloadingscanDTO.getDeliveryId());
+				if (inventoryLoadingNum != 0) {
+					loadingCount += inventoryLoadingNum;
+				}
+			}
+			if (planCount.get() - loadingCount > 0) {
+				builder.append("未装" + (planCount.get() - packageLoadingNum - inventoryLoadingNum) + "件");
+			}
+			if (loadingCount != 0) {
+				builder.append("装车" + loadingCount + "件");
 			}
-		}
-		if (planCount.get() - loadingCount > 0) {
-			builder.append("未装" + (planCount.get() - packageLoadingNum - inventoryLoadingNum) + "件");
-		}
-		if (loadingCount != 0) {
-			builder.append("装车" + loadingCount + "件");
-		}
 
-		distributionAsyncService.sendTrunkineLog(distributionDeliveryListEntity.getId(), null, AuthUtil.getUser(), warehouseClient.getMyCurrentWarehouse(), 1);
-		Map mapState = new HashMap();
-		mapState.put("messageId", CommonUtil.getUUID());
-		mapState.put("messageData", distributionDeliveryListEntity.getId());
-		mapState.put("createTime", System.currentTimeMillis());
-		try {
-			rabbitTemplate.convertAndSend(RabbitConstant.BUSINESS_PRE_CONVERSION_DATA_EXCHANGE, RabbitConstant.BUSINESS_PRE_CONVERSION_DATA_ROUTING, mapState, message -> {
-				message.getMessageProperties()
-					.setHeader("x-delay", 5000);
-				return message;
-			});
-		} catch (Exception customerException) {
-			log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", customerException);
+			distributionAsyncService.sendTrunkineLog(distributionDeliveryListEntity.getId(), null, AuthUtil.getUser(), warehouseClient.getMyCurrentWarehouse(), 1);
+			Map mapState = new HashMap();
+			mapState.put("messageId", CommonUtil.getUUID());
+			mapState.put("messageData", distributionDeliveryListEntity.getId());
+			mapState.put("createTime", System.currentTimeMillis());
+			try {
+				rabbitTemplate.convertAndSend(RabbitConstant.BUSINESS_PRE_CONVERSION_DATA_EXCHANGE, RabbitConstant.BUSINESS_PRE_CONVERSION_DATA_ROUTING, mapState, message -> {
+					message.getMessageProperties()
+						.setHeader("x-delay", 5000);
+					return message;
+				});
+			} catch (Exception customerException) {
+				log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", customerException);
+			}
+			//发车日志记录
+			handleLoadingStartLog(distributionDeliveryListEntity, user, myCurrentWarehouse, builder.toString());
+			NodeFanoutMsg<CarStartVO> nodeFanoutMsg = builderNodeFanoutMsgByCarStart(distributionDeliveryListEntity, user);
+			distributionNodeWorkService.carStart(nodeFanoutMsg, user);
+		} catch (NumberFormatException e) {
+			log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 发车异常", e);
 		}
-		//发车日志记录
-		handleLoadingStartLog(distributionDeliveryListEntity, user, myCurrentWarehouse, builder.toString());
-		NodeFanoutMsg<CarStartVO> nodeFanoutMsg = builderNodeFanoutMsgByCarStart(distributionDeliveryListEntity, user);
-		distributionNodeWorkService.carStart(nodeFanoutMsg, user);
 		// 推送数据
 
 		return Resp.scanSuccess("发车成功", builder.toString());

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsLogServiceImpl.java

@@ -14,6 +14,7 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -29,7 +30,7 @@ public class WarehouseTrayGoodsLogServiceImpl extends BaseServiceImpl<WarehouseT
 
 		BladeUser user = AuthUtil.getUser();
 		if(user==null){
-			trayGoodsLogEntity.setTenantId(TenantNum.HUITONGCODE);
+			trayGoodsLogEntity.setTenantId(StringUtil.isEmpty(AuthUtil.getTenantId())?TenantNum.HUITONGCODE:AuthUtil.getTenantId());
 			trayGoodsLogEntity.setCreateUser(1714696768639311873L);
 			trayGoodsLogEntity.setUpdateUser(1714696768639311873L);
 			trayGoodsLogEntity.setCreateDept(1649331096241836033L);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java

@@ -32,7 +32,9 @@ import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springblade.common.constant.TenantNum;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -154,7 +156,7 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl<WarehouseUp
 			warehouseUpdownGoodsLogEntity.setCreateUser(1714696768639311873L);
 			warehouseUpdownGoodsLogEntity.setUpdateUser(1714696768639311873L);
 			warehouseUpdownGoodsLogEntity.setCreateDept(1649331096241836033L);
-			warehouseUpdownGoodsLogEntity.setTenantId(TenantNum.HUITONGCODE);
+			warehouseUpdownGoodsLogEntity.setTenantId(StringUtil.isEmpty(AuthUtil.getTenantId())?TenantNum.HUITONGCODE:AuthUtil.getTenantId());
 			warehouseUpdownGoodsLogEntity.setUpdownTypeId(updownTypeEntity.getId());
 			warehouseUpdownGoodsLogEntity.setAreaId(updownTypeEntity.getAreaId());
 			warehouseUpdownGoodsLogEntity.setAreaTitle(updownTypeEntity.getAreaTitle());

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

@@ -54,6 +54,7 @@ import org.springblade.common.utils.TemplateUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.DateUtil;
@@ -265,7 +266,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 				distributionStockArticleEntity.setAcceptWarehouseName(warehouseWaybill.getDestinationWarehouseName());
 				distributionStockArticleEntity.setIsZero("1");
 				distributionStockArticleEntity.setIncomingNum(allNum);
-				distributionStockArticleEntity.setTenantId(TenantNum.HUITONGCODE);
+				distributionStockArticleEntity.setTenantId(StringUtil.isEmpty(AuthUtil.getTenantId())?TenantNum.HUITONGCODE:AuthUtil.getTenantId());
 
 				List<WarehouseWayBillDetail> details = warehouseWayBillDetailService.findByWaybillId(waybillId);
 				StringBuilder sb = new StringBuilder();
@@ -555,7 +556,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 		warehouseWaybill.setReceivedTotalPrice(BigDecimal.ZERO);
 		warehouseWaybill.setWaybillType(2);
 		warehouseWaybill.setReceivedStatus(0);
-		warehouseWaybill.setTenantId(TenantNum.HUITONGCODE);
+		warehouseWaybill.setTenantId(StringUtil.isEmpty(AuthUtil.getTenantId())?TenantNum.HUITONGCODE:AuthUtil.getTenantId());
 
 		BasicdataClientEntity agentClient = basicdataClientClient.findByName(agent);
 		if (!Objects.isNull(agentClient)) {