From 6444e8ee7f51d70e37dcde5fb59cb28bb87b28c7 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 20 Jun 2024 23:28:43 +0800 Subject: [PATCH] step --- .../serviceimpl/step/MesAssemblyGeneratePartNoStepService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyGeneratePartNoStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyGeneratePartNoStepService.java index 8d103ea..fd8b568 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyGeneratePartNoStepService.java +++ b/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 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(