1.推送订单包件信息到新系统

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryCommonServiceImpl.java

@@ -1,15 +1,12 @@
 package com.logpm.factory.comfac.service.impl;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.basicdata.entity.BasicdataTrayEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataTrayClient;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
-import com.logpm.factory.comfac.mapper.OrderPackageStatusPushFailLogMapper;
 import com.logpm.factory.comfac.service.IFactoryCommonService;
 import com.logpm.factory.comfac.service.IOrderPackageStatusPushFailLogService;
-import com.logpm.factory.entity.OrderPackageStatusPushFailLogEntity;
 import com.logpm.factory.pan.service.IPanFactoryDataService;
 import com.logpm.oldproject.entity.TrayEntity;
 import com.logpm.oldproject.entity.TrayScanEntity;
@@ -26,7 +23,6 @@ import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -132,6 +128,7 @@ public class FactoryCommonServiceImpl implements IFactoryCommonService {
 
 	@Override
 	public void extracted(String status, String unitNo, String currentWarehouseId, String operationTime, Integer trayId) {
+		log.info("#############extracted: 当前处理的数据为 status={} unitNo={} currentWarehouseId={} operationTime={} trayId={}",status,unitNo,currentWarehouseId,operationTime,trayId);
 		if ("4".equals(status) || "2".equals(status) || "1".equals(status)) {
 			//继续判断是否到达目的仓
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/OrderPackageStatusFallJob.java

@@ -30,15 +30,18 @@ public class OrderPackageStatusFallJob {
 	@XxlJob("getOrderPackageFromOldSystem")
 	public ReturnT<String> getOrderPackageFromOldSystem(String param) {
 		// 加载日志列表
-		QueryWrapper queryWrapper = new QueryWrapper();
+		QueryWrapper<OrderPackageStatusPushFailLogEntity> queryWrapper = new QueryWrapper();
 		queryWrapper.eq("data_status", 0);
 		List<OrderPackageStatusPushFailLogEntity> list = orderPackageStatusPushFailLogMapper.selectList(queryWrapper);
 		for (OrderPackageStatusPushFailLogEntity orderPackageStatusPushFailLogEntity : list) {
 
 			try {
+				String unitNo = orderPackageStatusPushFailLogEntity.getUnitNo();
+				log.info("##################getOrderPackageFromOldSystem: 当前处理的包件为 unitNo={}",unitNo);
+
 				// 重新获取数据
 				factoryCommonService.extracted(orderPackageStatusPushFailLogEntity.getOrderPackageStatus(),
-					orderPackageStatusPushFailLogEntity.getUnitNo(), orderPackageStatusPushFailLogEntity.getWarehouseId(),
+					unitNo, orderPackageStatusPushFailLogEntity.getWarehouseId(),
 					orderPackageStatusPushFailLogEntity.getOperationTime(), orderPackageStatusPushFailLogEntity.getTrayId()
 				);
 
@@ -46,11 +49,11 @@ public class OrderPackageStatusFallJob {
 
 			}catch (CustomerException e){
 				XxlJobLogger.log(e);
-
+				log.error("##################getOrderPackageFromOldSystem: 处理推送失败数据",e);
 				orderPackageStatusPushFailLogEntity.setDataStatus(2);
 			}catch (Exception e){
 				XxlJobLogger.log(e);
-
+				log.error("##################getOrderPackageFromOldSystem: 1111处理推送失败数据",e);
 				orderPackageStatusPushFailLogEntity.setDataStatus(2);
 			}
 			orderPackageStatusPushFailLogMapper.updateById(orderPackageStatusPushFailLogEntity);

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

@@ -5,15 +5,9 @@ import com.logpm.factory.comfac.dto.OrderStatusDTO;
 import com.logpm.factory.comfac.mapper.OrderPackageStatusPushFailLogMapper;
 import com.logpm.factory.comfac.service.IFactoryCommonService;
 import com.logpm.factory.entity.OrderPackageStatusPushFailLogEntity;
-import com.logpm.factory.pan.service.IPanFactoryDataService;
-import com.logpm.oldproject.feign.IAdvanceDetailClient;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
-import org.springblade.common.constant.OldSystemDataPushConfig;
 import org.springblade.common.constant.RabbitConstant;
-import org.springblade.common.exception.CustomerException;
-import org.springblade.core.redis.cache.BladeRedis;
-import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
@@ -57,7 +51,7 @@ public class DealWithDataHandler {
 
 		factoryCommonService.extracted(status, unitNo, currentWarehouseId, operationTime, trayId);
 
-		extracted(unitNo,currentWarehouseId);
+//		extracted(unitNo,currentWarehouseId);
 	}
 
 	/**