From ce2f10fe98357f0289369cbc9759a3a0c2da8f91 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 9 Apr 2025 18:25:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E7=BA=BF=20=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E8=AE=B0=E5=BD=95=E6=B1=87=E6=8A=A5=E7=8A=B6=E6=80=81?= =?UTF-8?q?=20=E5=8F=AA=E7=9C=8B=E5=BD=93=E5=89=8D=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E7=9A=84=E8=A3=85=E9=85=8D=E4=BB=B6=E7=9A=84=E6=B1=87=E6=8A=A5?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/step/MesProductionRecordGenerateStepService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionRecordGenerateStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionRecordGenerateStepService.java index ef056d1..f6f14c4 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionRecordGenerateStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionRecordGenerateStepService.java @@ -146,7 +146,11 @@ public class MesProductionRecordGenerateStepService extends BaseStepService { //排序 List productionAssemblySortContextList = prodRuleContext.getSortAssemblyDataContext(); Optional optional = CollectionUtils.isEmpty(productionAssemblySortContextList) ? null : - productionAssemblySortContextList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getReportType()) && o.getReportType().compareTo(MesExtEnumUtil.MES_REPORT_TYPE.NO_REPORT.getValue()) != 0)).findFirst(); + productionAssemblySortContextList.stream().filter(o -> (null != o + && !StringUtils.isEmpty(o.getWorkCellCode()) && !StringUtils.isEmpty(o.getReportType()) + && o.getWorkCellCode().equals(reqBean.getWorkCellCode()) + && o.getReportType().compareTo(MesExtEnumUtil.MES_REPORT_TYPE.NO_REPORT.getValue()) != 0 + && o.getReportType().compareTo(MesPcnExtConstWords.ZERO) != 0)).findFirst(); if (null == optional || !optional.isPresent()) { productionRecord.setReportType(MesExtEnumUtil.MES_REPORT_TYPE.NO_REPORT.getValue()); productionRecord.setReportStatus(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_30.getValue());