1.欧派收货逻辑修改

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

@@ -7,7 +7,6 @@ import com.logpm.factory.pan.service.IPanFactoryDataService;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.RabbitConstant;
-import org.springblade.common.utils.CommonUtil;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
@@ -15,8 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
-import java.time.LocalTime;
-import java.util.Date;
 import java.util.Map;
 
 
@@ -26,7 +23,7 @@ import java.util.Map;
  * @author yangkai.shen
  */
 @Slf4j
-@RabbitListener(queues = RabbitConstant.RECEIVE_INFO_QUEUE)
+@RabbitListener(queues = RabbitConstant.OUPAI_RECEIVING_QUEUE)
 @Component
 public class OpReceivingDataHandler {
 
@@ -58,7 +55,7 @@ public class OpReceivingDataHandler {
 				log.info("##################opReceivingDataHandler: 处理欧派收货数据到新系统,packageStatus:{},orderPackageCode:{},receivingTime{}",
 						packageStatus,orderPackageCode,receivingTime);
 				//判断是否是已入库
-				if("已入库".equals(packageStatus)){
+				if("已在库".equals(packageStatus)){
 					//真正的处理需要的数据
 					try {
 						panFactoryDataService.handleDataToPlatform(orderPackageCode, receivingTime);

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@@ -178,7 +178,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		map.put("createTime", new Date().getTime());
 		try {
 
-			rabbitTemplate.convertAndSend(RabbitConstant.RECEIVE_INFO_EXCHANGE, RabbitConstant.RECEIVE_INFO_ROUTING, map);
+			rabbitTemplate.convertAndSend(RabbitConstant.OUPAI_RECEIVING_EXCHANGE, RabbitConstant.OUPAI_RECEIVING_ROUTING, map);
 		} catch (Exception e) {
 			log.error("############handlePackageData: {}", e.getMessage());
 		}

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -572,7 +572,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 	 *
 	 * @param unitNo
 	 * @param distributionStockArticleEntity
-	 * @param id
+	 * @param waybillNo
 	 * @param basicdataWarehouseEntity
 	 */
 	private void saveOrderPackage(String unitNo, DistributionStockArticleEntity distributionStockArticleEntity,  BasicdataWarehouseEntity basicdataWarehouseEntity, String waybillNo) {