diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IFactoryOrderService.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IFactoryOrderService.java
index 60876c839..465ed771e 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IFactoryOrderService.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IFactoryOrderService.java
@@ -39,7 +39,7 @@ public interface IFactoryOrderService extends BaseService<FactoryOrderEntity> {
 	IPage<FactoryOrderVO> selectFactoryOrderPage(IPage<FactoryOrderVO> page, FactoryOrderVO factoryOrder);
 
 
-    FactoryOrderEntity selectEntityBySelfCode(String selfCode);
+    FactoryOrderEntity selectEntityBySelfCode(String selfCode,Long receivingId);
 
 	/**
 	 * 根据包件查询订单
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/FactoryOrderServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/FactoryOrderServiceImpl.java
index a992aee7a..cfafd5d1b 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/FactoryOrderServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/FactoryOrderServiceImpl.java
@@ -40,10 +40,11 @@ public class FactoryOrderServiceImpl extends BaseServiceImpl<FactoryOrderMapper,
 	}
 
 	@Override
-	public FactoryOrderEntity selectEntityBySelfCode(String selfCode) {
+	public FactoryOrderEntity selectEntityBySelfCode(String selfCode,Long receivingId) {
 		QueryWrapper<FactoryOrderEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.select("self_code","id");
 		queryWrapper.eq("self_code",selfCode);
+		queryWrapper.eq("receiving_id",receivingId);
 		return baseMapper.selectOne(queryWrapper);
 	}
 
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
index ac92e1057..2d7f7db07 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
@@ -738,7 +738,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 					}
 					String selfCode = orderEntity.getString("SelfCode");//订单自编码
 					//先查询是否存在订单自编码
-					FactoryOrderEntity factoryOrderEntity = factoryOrderService.selectEntityBySelfCode(selfCode);
+					FactoryOrderEntity factoryOrderEntity = factoryOrderService.selectEntityBySelfCode(selfCode,receivingId);
 
 					if (Objects.isNull(factoryOrderEntity)) {
 						factoryOrderEntity = new FactoryOrderEntity();
@@ -844,7 +844,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 
 						boolean save = factoryOrderService.save(factoryOrderEntity);
 						if (!save) {
-							log.warn("############handleData: 保存订单失败 selfCode={}", selfCode);
+							log.error("############handleData: 保存订单失败 selfCode={}", selfCode);
 							throw new CustomerException(403, "保存订单失败");
 						}
 					}