step

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyGeneratePartNoStepService.java

@@ -189,7 +189,7 @@ public class MesAssemblyGeneratePartNoStepService extends BaseStepService {
 
             //判断当前装配件规则清单是否完全匹配剩余未消费的条码
             Optional<MesProductionAssemblyNosortContext> optionalRule = productionAssemblyNosortContextList.stream().filter(o -> (null != o && o.getAssemblyStatus().compareTo(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_30.getValue()) == 0)).findFirst();
-            if (null != optional && !optional.isPresent()) continue;
+            if (null != optionalRule && optionalRule.isPresent()) continue;
 
             //验证加工规则是否有效
             MesProdRuleContext prodRuleContext = prodRuleCfgExtService.getProdRuleNosortContextByPid(new MesProdRuleContext(