From 60a35cddc12cb8347eebc425235a131e0881b8d3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 27 Jun 2025 16:42:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=B8=E5=A1=91=E6=89=93=E5=8C=85=E9=80=82?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/step/MesPackageNoGenerateStepService.java | 10 ++++++++-- .../i3plus/ext/mes/pcn/pojo/context/MesPackageRuleContext.java | 6 +++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesPackageNoGenerateStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesPackageNoGenerateStepService.java index 784d343..e2b47f6 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesPackageNoGenerateStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesPackageNoGenerateStepService.java @@ -153,6 +153,8 @@ public class MesPackageNoGenerateStepService extends BaseStepService implements } else { //获取包装规则信息 packageRuleContext = getPackageRuleContext(reqBean, stepResult, entry.getKey(), false); + Optional optional = prodRuleContextList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getIsPrintPackage()) && o.getIsPrintPackage().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) == 0)).findFirst(); + if (null == optional || !optional.isPresent()) packageRuleContext.setIsPrintPackage(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); } //无生产过程打包规则时, 忽略当前零件 @@ -532,6 +534,11 @@ public class MesPackageNoGenerateStepService extends BaseStepService implements @Override public MesProduceSnPrintModel doPrintPackageNo(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, MesPackageRuleContext packageRuleContext, MesLabelTemplate labelTemplate, IPrintTemplateStrategyService strategyService, List packageList, Boolean isAsyn) { + + MesProduceSnPrintModel printModel = null; + + if (packageRuleContext.getIsPrintPackage().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) == 0) return printModel; + if (null == strategyService) { //查询模版信息 labelTemplate = templateService.getLabelTemplate(packageRuleContext.getPackageTemplate(), reqBean.getOrganizeCode()); @@ -551,8 +558,6 @@ public class MesPackageNoGenerateStepService extends BaseStepService implements mesProduceSnPrintModel.setPartName(packageRuleContext.getPartName()); mesProduceSnPrintModel.getPackageList().addAll(packageList); - MesProduceSnPrintModel printModel = null; - try { printModel = strategyService.execute(null, mesProduceSnPrintModel, null, stepResult, reqBean, !StringUtils.isEmpty(reqBean.getWorkCellCode())); } catch (ImppBusiException e) { @@ -712,6 +717,7 @@ public class MesPackageNoGenerateStepService extends BaseStepService implements return virtualPsList; } + //生成一样的虚拟条码, 适配弹框输入工单数量 @Override public LinkedList generateVirtualPs(Double qty, String productSn) { LinkedList virtualPsList = new LinkedList<>(); diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesPackageRuleContext.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesPackageRuleContext.java index 4fb39c6..f6d7663 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesPackageRuleContext.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesPackageRuleContext.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.ext.mes.pcn.pojo.context; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -59,9 +60,12 @@ public class MesPackageRuleContext implements Serializable { public String printer; @ApiParam(name = "同步状态WMS") - public Integer systemSyncStatusWms = 2; + public Integer systemSyncStatusWms = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); @ApiParam("零件打包加工单号") public String partPackWorkOrderNo; + @ApiParam("是否打印包装条码") + private Integer isPrintPackage = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + }