feat(all): 修改推送消息失败问题

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

@@ -3056,7 +3056,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			orderStatusDTO.setOperationTime(DateUtil.now());
 			orderStatusDTO.setCurrentWarehouse(warehouseId.toString());
 			Map<String, Object> map = new HashMap<>();
-			map.put("messageData", orderStatusDTO);
+			map.put("messageData", JSONUtil.toJsonStr(orderStatusDTO));
 			rabbitTemplate.convertAndSend(RabbitConstant.HWY_ORDER_STATUS_EXCHANGE, RabbitConstant.HWY_ORDER_STATUS_ROUTING, map);
 		} catch (Exception e) {
 			log.error("入库推送失败：{}", e);

blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyOrderStatusHandler.java

@@ -1,5 +1,6 @@
 package com.logpm.factory.receiver;
 
+import cn.hutool.json.JSONUtil;
 import com.logpm.basicdata.feign.IBasicdataTrayClient;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.factory.comfac.constant.FactoryConstant;
@@ -56,7 +57,7 @@ public class HwyOrderStatusHandler {
 		final long deliveryTag = message.getMessageProperties().getDeliveryTag();
 		String msg = new String(message.getBody());
 		log.info("##################hwyOrderStatusHandler:  处理扫码作业数据");
-		OrderStatusDTO orderStatusDTO = (OrderStatusDTO) map.get("messageData");
+		OrderStatusDTO orderStatusDTO = JSONUtil.toBean((String) map.get("messageData"), OrderStatusDTO.class);
 		String orderSelfNum = orderStatusDTO.getOrderNo();//订单自编号
 		String unitNo = orderStatusDTO.getUnitNo();
 		//通过订单自编号去查询该条订单是属于哪个工厂

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java

@@ -1,6 +1,7 @@
 package com.logpm.trunkline.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
@@ -142,7 +143,7 @@ public class InComingServiceImpl implements IInComingService {
 					orderStatusDTO.setOperationTime(DateUtil.now());
 					orderStatusDTO.setCurrentWarehouse(warehouseId.toString());
 					Map<String, Object> map = new HashMap<>();
-					map.put("messageData", orderStatusDTO);
+					map.put("messageData", JSONUtil.toJsonStr(orderStatusDTO));
 					rabbitTemplate.convertAndSend(RabbitConstant.HWY_ORDER_STATUS_EXCHANGE, RabbitConstant.HWY_ORDER_STATUS_ROUTING, map);
 				} catch (Exception e) {
 					log.error("入库推送失败：{}", e);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java

@@ -1,6 +1,8 @@
 package com.logpm.trunkline.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.basic.entity.BasicMaterialEntity;
@@ -18,6 +20,7 @@ import com.logpm.distribution.feign.IDistributionParcelListClient;
 import com.logpm.distribution.feign.IDistributionStockArticleClient;
 import com.logpm.trunkline.dto.AdvanceDTO;
 import com.logpm.trunkline.dto.InComingDTO;
+import com.logpm.trunkline.dto.OrderStatusDTO;
 import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
 import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
 import com.logpm.trunkline.mapper.TrunklineAdvanceMapper;
@@ -29,12 +32,14 @@ import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.constant.TenantNum;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -53,6 +58,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 	private final IBasicdataTripartiteMallClient tripartiteMallClient;
 	private final IWarehouseWaybillClient warehouseWaybillClient;
 	private final IBasicdataTripartiteMallClient basicdataTripartiteMallClient;
+	private final RabbitTemplate rabbitTemplate;
 
 
 	@Override
@@ -626,7 +632,25 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 			orderPackageCodes.add(orderPackageCode);
 		}
 		parcelListClient.addBatch(parcelListEntityList);
-
+		try {
+			if(CollUtil.isNotEmpty(parcelListEntityList)){
+				for (DistributionParcelListEntity parcelListEntity : parcelListEntityList) {
+					// 发送入库消息
+					OrderStatusDTO orderStatusDTO = new OrderStatusDTO();
+					// 通过包件id 查询包件
+					orderStatusDTO.setUnitNo(parcelListEntity.getOrderPackageCode());
+					orderStatusDTO.setOrderNo(parcelListEntity.getOrderCode());
+					orderStatusDTO.setStatus("4");
+					orderStatusDTO.setOperationTime(DateUtil.now());
+					orderStatusDTO.setCurrentWarehouse(warehouseId.toString());
+					Map<String, Object> map = new HashMap<>();
+					map.put("messageData", JSONUtil.toJsonStr(orderStatusDTO));
+					rabbitTemplate.convertAndSend(RabbitConstant.HWY_ORDER_STATUS_EXCHANGE, RabbitConstant.HWY_ORDER_STATUS_ROUTING, map);
+				}
+			}
+		} catch (Exception e) {
+			log.error("入库推送失败：{}", e);
+		}
 		return orderPackageCodes;
 	}
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -2331,7 +2331,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			orderStatusDTO.setOperationTime(DateUtil.now());
 			orderStatusDTO.setCurrentWarehouse(warehouseId.toString());
 			Map<String, Object> map = new HashMap<>();
-			map.put("messageData", orderStatusDTO);
+			map.put("messageData", JSONUtil.toJsonStr(orderStatusDTO));
 			rabbitTemplate.convertAndSend(RabbitConstant.HWY_ORDER_STATUS_EXCHANGE, RabbitConstant.HWY_ORDER_STATUS_ROUTING, map);
 		} catch (Exception e) {
 			log.error("入库推送失败：{}", e);