1.修改推送作业节点临时解决方案

blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataMessageSender.java

@@ -6,6 +6,7 @@ import com.logpm.factorydata.vo.NodePushMsg;
 import com.logpm.factorydata.vo.SendMsg;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.factorydata.FactoryDataConstants;
 import org.springblade.common.utils.HutoolConfigUtil;
 import org.springframework.stereotype.Component;
@@ -17,6 +18,7 @@ import org.springframework.stereotype.Component;
 @Component
 @Builder
 @AllArgsConstructor
+@Slf4j
 public class FactoryDataMessageSender {
 
 	private final IFactoryDataClient factoryDataClient;
@@ -27,9 +29,18 @@ public class FactoryDataMessageSender {
 	 * @param data
 	 */
 	public void sendNodeDataByBrand(NodePushMsg data) {
+		try{
 			String routingKeyByName = FactoryDataUtil.findRoutingKeyByName(data.getBrand());
+			if(routingKeyByName == null){
+				return ;
+			}
 			SendMsg build = SendMsg.builder().exchange(FactoryDataConstants.Mq.Exchanges.NODE_DATA_PUSH).routingKey(routingKeyByName).message(JSONUtil.toJsonStr(data, HutoolConfigUtil.jsonConfigByDataTimeFormat())).build();
 			factoryDataClient.sendMessage(build);
+		}catch (Exception e){
+			log.error("sendNodeDataByBrand  >>>>" ,e);
+
+		}
+
 	}
 
 }

blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataUtil.java

@@ -35,7 +35,7 @@ public class FactoryDataUtil {
 	 * @return 指定路由key
 	 */
 	public static String findRoutingKeyByName(BrandEnums brand) {
-		if (ObjectUtil.hasNull(brand, factorys.get(brand.getValue()))) {
+		if (ObjectUtil.isAllEmpty(brand, brand.getValue(),factorys.get(brand.getValue()))) {
 			// TODO 业务调用不规范，特殊处理
 			return null;
 		}

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

@@ -581,9 +581,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 	@Override
 	@Transactional(isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
-
 //	synchronized
 	public R loadingscan(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
+		try{
 			//查询该包件是否能够从库存品包件表中查到
 			String now = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
 
@@ -772,9 +772,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							.setHeader("x-delay", 3000);
 						return message;
 					});
-				String content = "包件在"+myCurrentWarehouse.getName()+"由"+loadscanEntity.getScanUser()+"扫描装车，配送车次号:"+distributionDeliveryListEntity.getTrainNumber()+"预约任务号:"+reservationEntity.getReservationCode();
 					JSONObject trunklinePackageTrackLog= new JSONObject();
 					try {
+						String content = "包件在"+myCurrentWarehouse.getName()+"由"+loadscanEntity.getScanUser()+"扫描装车，配送车次号:"+distributionDeliveryListEntity.getTrainNumber()+"预约任务号:"+reservationEntity.getReservationCode();
 						trunklinePackageTrackLog.put("tenantId",loadscanEntity.getTenantId());
 						trunklinePackageTrackLog.put("createTime",loadscanEntity.getCreateTime());
 						trunklinePackageTrackLog.put("createUser",loadscanEntity.getCreateUser());
@@ -1057,6 +1057,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 			Integer carLaodNum = getCarLaodNum(distrilbutionloadingscanDTO.getDeliveryId());
 			return Resp.scanSuccessWithData("装车成功",   carLaodNum + "件", carLaodNum);
+		}catch (Exception e){
+			log.error("装车扫码错误",e);
+			throw new CustomerException(e.getMessage());
+		}
+
+
 	}
 
 	private void extracteOrderPackageStatus(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO, DistributionParcelListEntity parcelListEntity, BasicdataWarehouseEntity myCurrentWarehouse, DistributionReservationEntity reservationEntity) {