diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java
index 27b4c44..2163477 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java
@@ -306,12 +306,11 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
         boolean checkResult = true;
         //查询装配记录
         requestModel.setAssemblyPartStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue());
-        requestModel.setIsOrigSn(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
-        List<MesProductionAssembly> mesProductionAssemblies = assemblyQuery(requestModel);
-        if (CollectionUtils.isEmpty(mesProductionAssemblies)) MesPcnException.throwFlowException("未查询到没有替换的装配件记录");
+        List<MesProductionAssembly> productionAssemblies = assemblyQuery(requestModel).stream().filter(t -> CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == t.getIsOrigSn()).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(productionAssemblies)) MesPcnException.throwFlowException("未查询到没有替换的装配件记录");
         Map<String,MesWorkCenter> mesWorkCenterMap = new HashMap<>();
         //匹配装配件
-        for (MesProductionAssembly assembly : mesProductionAssemblies) {
+        for (MesProductionAssembly assembly : productionAssemblies) {
             Object context = getContext(requestModel, assembly,mesWorkCenterMap);
             //匹配规则
             Map<String, Object> result = numberRuleMatchDispatchService.matchNumberRule(requestModel.getOrganizeCode(), requestModel.getSn(), context);