Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/interceptor/LocalServerLoginAccountsInterceptor.java

@@ -64,7 +64,7 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt
 			// 修改或添加header
 
 			// 发送登录请求
-			log.info("##########preHandle: request={}", request);
+			log.info("##########preHandle: request={}", data);
 
 			wrappedRequest.addHeader("Blade-Auth", "bearer "+data.getString("access_token"));
 			HttpHeaders httpHeaders = new HttpHeaders();

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

@@ -44,6 +44,7 @@ public class DealWithDataHandler {
 		// 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉
 
 		OrderStatusDTO orderStatusDTO = (OrderStatusDTO) map.get("messageData");
+		log.info("############dealWithDataHandler: 处理在库订单数据到新系统 {}",orderStatusDTO);
 		String status = orderStatusDTO.getStatus();
 		String unitNo = orderStatusDTO.getUnitNo();
 		String operationTime = orderStatusDTO.getOperationTime();
@@ -55,7 +56,7 @@ public class DealWithDataHandler {
 			sourceName = "汇通";
 		}
 		log.info("##################dealWithDataHandler: 处理在库订单数据到新系统 来源：{}  品牌：{}",sourceName,orderStatusDTO.getBrandName());
-		if("汇通".equals(orderStatusDTO.getSourceName())){
+		if("汇通".equals(sourceName)){
 			factoryCommonService.extracted(status, unitNo, currentWarehouseId, operationTime, trayId);
 		}else{
 			log.warn(">>>> 不是汇通的数据 不进入汇通入库数据");